infra: Add new configs to CQ.

This leaves the old configs in place. We can't remove them
until the CQ bots switch over.

Bug: angleproject:6496
Change-Id: Id9ee70cfd65cd85a7525b42f08d78873f31a7cd8
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3226301
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

infra/config/generated/commit-queue.cfg

@@ -28,72 +28,72 @@ config_groups {
     }
     tryjob {
       builders {
-        name: "angle/try/android-arm-dbg"
+        name: "angle/try/android-arm-compile"
       }
       builders {
-        name: "angle/try/android-arm-rel"
+        name: "angle/try/android-arm-dbg-compile"
       }
       builders {
-        name: "angle/try/android-arm64-dbg"
+        name: "angle/try/android-arm64-dbg-compile"
       }
       builders {
-        name: "angle/try/android-arm64-rel"
+        name: "angle/try/android-arm64-test"
       }
       builders {
-        name: "angle/try/linux-clang-dbg"
+        name: "angle/try/linux-dbg-compile"
       }
       builders {
-        name: "angle/try/linux-clang-rel"
+        name: "angle/try/linux-test"
       }
       builders {
-        name: "angle/try/linux-trace-rel"
+        name: "angle/try/linux-trace"
         location_regexp: ".+/[+]/src/libANGLE/capture/.+"
         location_regexp: ".+/[+]/src/tests/capture.+"
       }
       builders {
-        name: "angle/try/mac-dbg"
+        name: "angle/try/mac-dbg-compile"
       }
       builders {
-        name: "angle/try/mac-rel"
+        name: "angle/try/mac-test"
       }
       builders {
         name: "angle/try/presubmit"
         disable_reuse: true
       }
       builders {
-        name: "angle/try/win-clang-x64-dbg"
+        name: "angle/try/win-dbg-compile"
       }
       builders {
-        name: "angle/try/win-clang-x64-rel"
+        name: "angle/try/win-msvc-compile"
       }
       builders {
-        name: "angle/try/win-clang-x86-dbg"
+        name: "angle/try/win-msvc-dbg-compile"
       }
       builders {
-        name: "angle/try/win-clang-x86-rel"
+        name: "angle/try/win-msvc-x86-compile"
       }
       builders {
-        name: "angle/try/win-msvc-x64-dbg"
+        name: "angle/try/win-msvc-x86-dbg-compile"
       }
       builders {
-        name: "angle/try/win-msvc-x64-rel"
+        name: "angle/try/win-test"
       }
       builders {
-        name: "angle/try/win-msvc-x86-dbg"
-      }
-      builders {
-        name: "angle/try/win-msvc-x86-rel"
-      }
-      builders {
-        name: "angle/try/win-trace-rel"
+        name: "angle/try/win-trace"
         location_regexp: ".+/[+]/src/libANGLE/capture/.+"
         location_regexp: ".+/[+]/src/tests/capture.+"
       }
       builders {
-        name: "angle/try/winuwp-x64-dbg"
+        name: "angle/try/win-x86-dbg-compile"
       }
       builders {
-        name: "angle/try/winuwp-x64-rel"
+        name: "angle/try/win-x86-test"
+      }
+      builders {
+        name: "angle/try/winuwp-compile"
+      }
+      builders {
+        name: "angle/try/winuwp-dbg-compile"
       }
       builders {
         name: "chromium/try/android-angle-chromium-try"

infra/config/main.star

@@ -294,10 +294,9 @@ def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode
             ),
         )
 
-        # Include all other bots in the CQ by default except the placeholder GCC configs.
-        # TODO(jmadill): Include new bots in CQ. http://anglebug.com/6496
+        # TODO(jmadill): Finish transition by removing old configs. http://anglebug.com/6496
         is_new_config = name.endswith("-test") or name.endswith("-compile") or name.endswith("-trace")
-        if toolchain != "gcc" and not is_new_config:
+        if is_new_config:
             luci.cq_tryjob_verifier(
                 cq_group = "master",
                 builder = "angle:try/" + name,