Add gn_v2 CQ builders to milestone CQ groups

Adds the gn_v2 CQ builders to the Dawn-CQ-<Milestone> CQ groups. This is
equivalent behavior to the legacy builders which have been replaced, but
was missed during the initial migration.

Bug: 385317083
Change-Id: I81486b882be3ca71698645208bbaec63f2f88a42
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/266676
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@google.com>
diff --git a/infra/config/global/generated/luci/commit-queue.cfg b/infra/config/global/generated/luci/commit-queue.cfg
index ea5499b..faad232 100644
--- a/infra/config/global/generated/luci/commit-queue.cfg
+++ b/infra/config/global/generated/luci/commit-queue.cfg
@@ -1170,6 +1170,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -1267,6 +1309,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -1364,6 +1448,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -1461,6 +1587,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -1558,6 +1726,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -1655,6 +1865,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -1752,6 +2004,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -1849,6 +2143,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -1946,6 +2282,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2043,6 +2421,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2143,6 +2563,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2243,6 +2705,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2343,6 +2847,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2443,6 +2989,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2546,6 +3134,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2649,6 +3279,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2752,6 +3424,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2855,6 +3569,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -2962,6 +3718,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3069,6 +3867,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3176,6 +4016,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3283,6 +4165,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3390,6 +4314,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3497,6 +4463,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3604,6 +4612,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3711,6 +4761,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3818,6 +4910,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -3925,6 +5059,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -4032,6 +5208,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -4139,6 +5357,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
@@ -4246,6 +5506,48 @@
         experiment_percentage: 100
       }
       builders {
+        name: "dawn/try/dawn-cq-linux-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-fuzz-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-linux-x86-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-mac-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x64-rel"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-dbg"
+      }
+      builders {
+        name: "dawn/try/dawn-cq-win-x86-rel"
+      }
+      builders {
         name: "dawn/try/presubmit"
         disable_reuse: true
       }
diff --git a/infra/config/global/gn_standalone_try.star b/infra/config/global/gn_standalone_try.star
index 1aeb212..6c84e18 100644
--- a/infra/config/global/gn_standalone_try.star
+++ b/infra/config/global/gn_standalone_try.star
@@ -31,6 +31,7 @@
 load("@chromium-luci//try.star", "try_")
 load("//constants.star", "siso")
 load("//location_filters.star", "exclusion_filters")
+load("//project.star", "ACTIVE_MILESTONES")
 
 try_.defaults.set(
     executable = "recipe:dawn/gn_v2_trybot",
@@ -96,35 +97,44 @@
     ))
     return kwargs
 
+def add_builder_to_main_and_milestone_cq_groups(kwargs):
+    # Dawn standalone builders run fine unbranched on branched CLs.
+    try_.builder(**kwargs)
+    for milestone in ACTIVE_MILESTONES.keys():
+        luci.cq_tryjob_verifier(
+            cq_group = "Dawn-CQ-" + milestone,
+            builder = "dawn:try/" + kwargs["name"],
+        )
+
 def dawn_linux_functional_cq_tester(**kwargs):
     kwargs = apply_linux_cq_builder_defaults(kwargs)
     kwargs = apply_functional_builder_with_node_defaults(kwargs)
-    try_.builder(**kwargs)
+    add_builder_to_main_and_milestone_cq_groups(kwargs)
 
 def dawn_mac_functional_cq_tester(**kwargs):
     kwargs = apply_mac_cq_builder_defaults(kwargs)
     kwargs = apply_functional_builder_with_node_defaults(kwargs)
-    try_.builder(**kwargs)
+    add_builder_to_main_and_milestone_cq_groups(kwargs)
 
 def dawn_win_functional_cq_tester(**kwargs):
     kwargs = apply_win_cq_builder_defaults(kwargs)
     kwargs = apply_functional_builder_with_node_defaults(kwargs)
-    try_.builder(**kwargs)
+    add_builder_to_main_and_milestone_cq_groups(kwargs)
 
 def dawn_linux_functional_cq_tester_without_node(**kwargs):
     kwargs = apply_linux_cq_builder_defaults(kwargs)
     kwargs = apply_functional_builder_without_node_defaults(kwargs)
-    try_.builder(**kwargs)
+    add_builder_to_main_and_milestone_cq_groups(kwargs)
 
 def dawn_win_functional_cq_tester_without_node(**kwargs):
     kwargs = apply_win_cq_builder_defaults(kwargs)
     kwargs = apply_functional_builder_without_node_defaults(kwargs)
-    try_.builder(**kwargs)
+    add_builder_to_main_and_milestone_cq_groups(kwargs)
 
 def dawn_linux_fuzz_cq_tester(**kwargs):
     kwargs = apply_linux_cq_builder_defaults(kwargs)
     kwargs = apply_fuzz_builder_defaults(kwargs)
-    try_.builder(**kwargs)
+    add_builder_to_main_and_milestone_cq_groups(kwargs)
 
 ## Functional testers