Mirror CI builders in the try pool

This will allow testing specific configurations that are on CI
builders when trying to fix them.

Change-Id: If0bc5449e8d5088eff6695ac8671d06d7119dd59
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 718058e..023f2fc 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -198,30 +198,53 @@
       service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
 
+    # A subset of the CI configurations are used for the CQ. We still mirror
+    # the CI builders here so we can trigger tryjobs on their specific
+    # configuration.
+
+    # CI Mirror only
     builders {
       name: "linux-clang-dbg-x64"
       dimensions: "os:Ubuntu-14.04"
       mixins: "debug"
       mixins: "x64"
     }
+    # CI Mirror only
+    builders {
+      name: "linux-clang-dbg-x86"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "debug"
+      mixins: "x86"
+    }
+    # Actually on the CQ
     builders {
       name: "linux-clang-rel-x64"
       dimensions: "os:Ubuntu-14.04"
       mixins: "release"
       mixins: "x64"
     }
+    # Actually on the CQ
+    builders {
+      name: "linux-clang-rel-x86"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "release"
+      mixins: "x86"
+    }
 
+    # Actually on the CQ
     builders {
       name: "mac-dbg"
       dimensions: "os:Mac"
       mixins: "debug"
     }
+    # Actually on the CQ
     builders {
       name: "mac-rel"
       dimensions: "os:Mac"
       mixins: "release"
     }
 
+    # Actually on the CQ
     builders {
       name: "win-clang-dbg-x64"
       dimensions: "os:Windows"
@@ -229,6 +252,15 @@
       mixins: "debug"
       mixins: "x64"
     }
+    # CI Mirror only
+    builders {
+      name: "win-clang-dbg-x86"
+      dimensions: "os:Windows"
+      mixins: "clang"
+      mixins: "debug"
+      mixins: "x86"
+    }
+    # Actually on the CQ
     builders {
       name: "win-clang-rel-x64"
       dimensions: "os:Windows"
@@ -236,5 +268,29 @@
       mixins: "release"
       mixins: "x64"
     }
+    # CI Mirror only
+    builders {
+      name: "win-clang-rel-x86"
+      dimensions: "os:Windows"
+      mixins: "clang"
+      mixins: "release"
+      mixins: "x86"
+    }
+    # CI Mirror only
+    builders {
+      name: "win-msvc-dbg-x64"
+      dimensions: "os:Windows"
+      mixins: "no_clang"
+      mixins: "debug"
+      mixins: "x64"
+    }
+    # CI Mirror only
+    builders {
+      name: "win-msvc-rel-x64"
+      dimensions: "os:Windows"
+      mixins: "no_clang"
+      mixins: "release"
+      mixins: "x64"
+    }
   }
 }