cleanup: gather all goma canary builders.

Since Goma Canary builders are scattered to cr-buildbucket.cfg and
is difficult to see, let me gather all the builders to one place.

Bug: 874754
Change-Id: Ie8ca261cc28f734c4175d6fc07082429e0c026da
Reviewed-on: https://chromium-review.googlesource.com/1188045Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585729}

infra/config/global/cr-buildbucket.cfg

@@ -1601,12 +1601,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-fyi-ci"
     }
-    builders {
-      name: "Mac Builder (dbg) Goma Canary (clobber)"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "WebKit Linux Trusty MSAN"
       dimensions: "os:Ubuntu-14.04"
@@ -1651,12 +1645,6 @@ buckets {
       dimensions: "cores:4"
       mixins: "lkgr-ci"
     }
-    builders {
-      name: "Mac Goma Canary (clobber)"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "WebKit Linux Trusty ASAN"
       dimensions: "os:Ubuntu-14.04"
@@ -1694,11 +1682,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "lkgr-ci"
     }
-    builders {
-      name: "Win Builder Goma Canary"
-      dimensions: "os:Windows-10"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "ASAN Release Media"
       dimensions: "os:Ubuntu-14.04"
@@ -1744,11 +1727,6 @@ buckets {
       dimensions: "cores:32"
       mixins: "chromium-ci"
     }
-    builders {
-      name: "Android Builder (dbg) Goma Canary"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Oreo Phone Tester"
       dimensions: "os:Ubuntu-14.04"
@@ -1774,12 +1752,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
     }
-    builders {
-      name: "Mac Goma Canary LocalOutputCache"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Android Cronet ARM64 Builder"
       dimensions: "os:Ubuntu-14.04"
@@ -1819,11 +1791,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci"
     }
-    builders {
-      name: "Win7 Builder Goma Canary"
-      dimensions: "os:Windows-7"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Mac ASan 64 Tests (1)"
       dimensions: "os:Mac-10.13"
@@ -1878,17 +1845,6 @@ buckets {
       dimensions: "cores:4"
       mixins: "fyi-ci"
     }
-    builders {
-      name: "Mac Builder (dbg) Goma Canary"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "fyi-ci"
-    }
-    builders {
-      name: "Win Builder (dbg) Goma Canary"
-      dimensions: "os:Windows-10"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Libfuzzer Upload Linux UBSan"
       dimensions: "os:Ubuntu-14.04"
@@ -1953,11 +1909,6 @@ buckets {
       dimensions: "cores:4"
       mixins: "fyi-ci"
     }
-    builders {
-      name: "Linux x64 Goma Canary LocalOutputCache"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Android Cronet KitKat Builder"
       dimensions: "os:Ubuntu-14.04"
@@ -2059,16 +2010,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
     }
-    builders {
-      name: "Linux Builder Goma Canary"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
-    builders {
-      name: "Win cl.exe Goma Canary LocalOutputCache"
-      dimensions: "os:Windows-10"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Linux remote_run Builder"
       dimensions: "os:Ubuntu-14.04"
@@ -2079,11 +2020,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-fyi-ci"
     }
-    builders {
-      name: "Win7 Builder (dbg) Goma Canary"
-      dimensions: "os:Windows-7"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Android Cronet ARM64 Builder (dbg)"
       dimensions: "os:Ubuntu-14.04"
@@ -2129,11 +2065,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
     }
-    builders {
-      name: "Win Goma Canary LocalOutputCache"
-      dimensions: "os:Windows-10"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Linux Chromium OS ASan LSan Tests (1)"
       dimensions: "os:Ubuntu-14.04"
@@ -2149,12 +2080,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-fyi-ci"
     }
-    builders {
-      name: "Mac Builder Goma Canary"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "Chromium Windows Analyze"
       dimensions: "os:Windows-10"
@@ -2177,16 +2102,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "lkgr-ci"
     }
-    builders {
-      name: "WinMSVC64 Goma Canary"
-      dimensions: "os:Windows-10"
-      mixins: "fyi-ci"
-    }
-    builders {
-      name: "Linux x64 Goma Canary (clobber)"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "WebKit Win10"
       dimensions: "os:Windows-10"
@@ -2235,6 +2150,7 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
     }
+    # Goma Staging
     builders {
       name: "Chromium Linux Goma RBE Staging (dbg)"
       dimensions: "os:Ubuntu-14.04"
@@ -2287,6 +2203,92 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "goma-ci"
     }
+    # Goma Canary
+    builders {
+      name: "Mac Builder (dbg) Goma Canary (clobber)"
+      dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Mac Goma Canary (clobber)"
+      dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Win Builder Goma Canary"
+      dimensions: "os:Windows-10"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Android Builder (dbg) Goma Canary"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Mac Goma Canary LocalOutputCache"
+      dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Win7 Builder Goma Canary"
+      dimensions: "os:Windows-7"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Mac Builder (dbg) Goma Canary"
+      dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Win Builder (dbg) Goma Canary"
+      dimensions: "os:Windows-10"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Linux x64 Goma Canary LocalOutputCache"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Linux Builder Goma Canary"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Win cl.exe Goma Canary LocalOutputCache"
+      dimensions: "os:Windows-10"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Win7 Builder (dbg) Goma Canary"
+      dimensions: "os:Windows-7"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Win Goma Canary LocalOutputCache"
+      dimensions: "os:Windows-10"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Mac Builder Goma Canary"
+      dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "WinMSVC64 Goma Canary"
+      dimensions: "os:Windows-10"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "Linux x64 Goma Canary (clobber)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "fyi-ci"
+    }
     ############################################################################
     # End luci-check managed section
     ############################################################################