[cr-buildbucket] chromium.fyi fixes

* Default Mac to 4 cores
* Add recipe names to non chromium recipes

Bug: 840631
Change-Id: Ib90206c80f41efa9e9d6aaed6977b39101a8f5a0
Reviewed-on: https://chromium-review.googlesource.com/1103221Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567795}

infra/config/global/cr-buildbucket.cfg

@@ -224,6 +224,20 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "libfuzzer"
+  recipe {
+    name: "chromium_libfuzzer"
+  }
+}
+
+builder_mixins {
+  name: "deterministic"
+  recipe {
+    name: "swarming/deterministic_build"
+  }
+}
+
 builder_mixins {
   name: "goma-ci"
   recipe {
@@ -705,18 +719,14 @@ buckets {
 
     builders {
       name: "Deterministic Android"
+      mixins: "deterministic"
       mixins: "android-ci"
-      recipe {
-        name: "swarming/deterministic_build"
-      }
     }
 
     builders {
       name: "Deterministic Android (dbg)"
+      mixins: "deterministic"
       mixins: "android-ci"
-      recipe {
-        name: "swarming/deterministic_build"
-      }
     }
 
     builders {
@@ -842,18 +852,14 @@ buckets {
 
     builders {
       name: "Deterministic Linux"
+      mixins: "deterministic"
       mixins: "linux-ci"
-      recipe {
-        name: "swarming/deterministic_build"
-      }
     }
 
     builders {
       name: "Deterministic Linux (dbg)"
+      mixins: "deterministic"
       mixins: "linux-ci"
-      recipe {
-        name: "swarming/deterministic_build"
-      }
     }
 
     builders {
@@ -1474,6 +1480,7 @@ buckets {
     builders {
       name: "Mac Builder (dbg) Goma Canary (clobber)"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -1502,6 +1509,7 @@ buckets {
       name: "Libfuzzer Upload Linux MSan"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "libfuzzer"
     }
     builders {
       name: "TSAN Debug"
@@ -1532,6 +1540,7 @@ buckets {
     builders {
       name: "Mac Goma Canary (clobber)"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -1542,7 +1551,9 @@ buckets {
     builders {
       name: "Libfuzzer Upload Mac ASan"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
+      mixins: "libfuzzer"
     }
     builders {
       name: "Site Isolation Win"
@@ -1620,6 +1631,7 @@ buckets {
     builders {
       name: "Out of Process Profiling Mac"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -1671,6 +1683,7 @@ buckets {
     builders {
       name: "Mac Goma Canary LocalOutputCache"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -1687,11 +1700,15 @@ buckets {
       name: "Afl Upload Linux ASan"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      recipe {
+        name: "chromium_afl"
+      }
     }
     builders {
       name: "Windows Clang deterministic"
       dimensions: "os:Windows-10"
       mixins: "fyi-ci"
+      mixins: "deterministic"
     }
     builders {
       name: "Win 10 Fast Ring"
@@ -1741,7 +1758,9 @@ buckets {
     builders {
       name: "Mac deterministic"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
+      mixins: "deterministic"
     }
     builders {
       name: "Site Isolation Android"
@@ -1782,6 +1801,7 @@ buckets {
     builders {
       name: "Jumbo Mac"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -1792,6 +1812,7 @@ buckets {
     builders {
       name: "Mac Builder (dbg) Goma Canary"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -1803,6 +1824,7 @@ buckets {
       name: "Libfuzzer Upload Linux UBSan"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "libfuzzer"
     }
     builders {
       name: "WebKit Win Builder"
@@ -1822,7 +1844,9 @@ buckets {
     builders {
       name: "Mac deterministic (dbg)"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
+      mixins: "deterministic"
     }
     builders {
       name: "Android Builder"
@@ -1838,11 +1862,15 @@ buckets {
       name: "Libfuzzer Upload Linux ASan Debug"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "libfuzzer"
     }
     builders {
       name: "Closure Compilation Linux"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      recipe {
+        name: "closure_compilation"
+      }
     }
     builders {
       name: "Mojo Windows"
@@ -1852,6 +1880,7 @@ buckets {
     builders {
       name: "Chromium Mac 10.13"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -1884,6 +1913,7 @@ buckets {
       name: "Libfuzzer Upload Linux ASan"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "libfuzzer"
     }
     builders {
       name: "Mac 10.6"
@@ -1918,6 +1948,7 @@ buckets {
     builders {
       name: "ios11-beta-simulator"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -1958,6 +1989,7 @@ buckets {
     builders {
       name: "mac-views-rel"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -2079,16 +2111,21 @@ buckets {
     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"
       mixins: "fyi-ci"
+      recipe {
+        name: "win_analyze"
+      }
     }
     builders {
       name: "ios-device-goma-canary-clobber"
       dimensions: "os:Mac-10.13"
+      dimensions: "cores:4"
       mixins: "fyi-ci"
     }
     builders {
@@ -2141,6 +2178,7 @@ buckets {
       name: "Windows deterministic"
       dimensions: "os:Windows-10"
       mixins: "fyi-ci"
+      mixins: "deterministic"
     }
     builders {
       name: "Linux ARM"
@@ -2471,11 +2509,9 @@ buckets {
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_variable_chrome" }
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_variable_deflake" }
     builders {
-      mixins: "linux-try"
       name: "linux_chromium_clobber_deterministic",
-      recipe {
-        name: "swarming/deterministic_build"
-      }
+      mixins: "linux-try"
+      mixins: "deterministic"
     }
     builders { mixins: "linux-try" name: "linux_chromium_clobber_rel_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_compile_dbg_32_ng" }