Add LUCI Linux and Mac ANGLE, and optional GPU, trybots to cr-buildbucket.cfg.

These need a different service account than some of the other trybots
for some of the tests they check out and run.

Bug: 815092
Change-Id: Ieb4eb45971c5b057642722eb615f586e8e212d6b
Reviewed-on: https://chromium-review.googlesource.com/955681Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541951}

infra/config/global/cr-buildbucket.cfg

@@ -103,6 +103,14 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "angle-try"
+  service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  recipe {
+    properties: "mastername:tryserver.chromium.angle"
+  }
+}
+
 builder_mixins {
   name: "fyi-ci"
   recipe {
@@ -118,11 +126,31 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "gpu-optional-try"
+  service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+}
+
 builder_mixins {
   name: "linux"
   dimensions: "os:Ubuntu-14.04"
 }
 
+builder_mixins {
+  name: "linux-angle-try"
+  mixins: "linux"
+  mixins: "angle-try"
+}
+
+builder_mixins {
+  name: "linux-optional-gpu-try"
+  mixins: "linux"
+  mixins: "gpu-optional-try"
+  recipe {
+    properties: "mastername:tryserver.chromium.linux"
+  }
+}
+
 builder_mixins {
   name: "linux-try"
   mixins: "linux"
@@ -161,6 +189,21 @@ builder_mixins {
   dimensions: "os:Mac"
 }
 
+builder_mixins {
+  name: "mac-angle-try"
+  mixins: "mac"
+  mixins: "angle-try"
+}
+
+builder_mixins {
+  name: "mac-optional-gpu-try"
+  mixins: "mac"
+  mixins: "gpu-optional-try"
+  recipe {
+    properties: "mastername:tryserver.chromium.mac"
+  }
+}
+
 builder_mixins {
   name: "mac-try"
   mixins: "mac"
@@ -734,6 +777,11 @@ buckets {
     builders { mixins: "linux-try" name: "closure_compilation" }
     builders { mixins: "linux-try" name: "fuchsia" }
     builders { mixins: "linux-try" name: "linux_android_rel_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_compile_dbg_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_dbg_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_deqp_rel_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_ozone_rel_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_rel_ng" }
     builders { mixins: "linux-try" name: "linux_arm" }
     builders { mixins: "linux-try" name: "linux_chromium_analysis" }
     builders { mixins: "linux-try" name: "linux_chromium_archive_rel_ng" }
@@ -793,7 +841,7 @@ buckets {
     builders { mixins: "linux-try" name: "linux_mojo_chromeos" }
     builders { mixins: "linux-try" name: "linux_nacl_sdk" }
     builders { mixins: "linux-try" name: "linux_nacl_sdk_build" }
-    builders { mixins: "linux-try" name: "linux_optional_gpu_tests_rel" }
+    builders { mixins: "linux-optional-gpu-try" name: "linux_optional_gpu_tests_rel" }
     builders { mixins: "linux-try" name: "linux_site_isolation" }
     builders { mixins: "linux-try" name: "linux_upload_clang" }
 
@@ -803,6 +851,9 @@ buckets {
     builders { mixins: "mac-try" name: "ios-simulator-cronet" }
     builders { mixins: "mac-try" name: "ios-simulator-eg" }
     builders { mixins: "mac-try" name: "ios-simulator-xcode-clang" }
+    builders { mixins: "mac-angle-try" name: "mac_angle_compile_dbg_ng" }
+    builders { mixins: "mac-angle-try" name: "mac_angle_dbg_ng" }
+    builders { mixins: "mac-angle-try" name: "mac_angle_rel_ng" }
     builders { mixins: "mac-try" name: "mac_chromium_10.10_macviews" }
     builders { mixins: "mac-try" name: "mac_chromium_10.10_rel_ng" }
     builders { mixins: "mac-try" name: "mac_chromium_10.12_rel_ng" }
@@ -826,7 +877,7 @@ buckets {
     builders { mixins: "mac-try" name: "mac_chromium_variable_layout" }
     builders { mixins: "mac-try" name: "mac_nacl_sdk" }
     builders { mixins: "mac-try" name: "mac_nacl_sdk_build" }
-    builders { mixins: "mac-try" name: "mac_optional_gpu_tests_rel" }
+    builders { mixins: "mac-optional-gpu-try" name: "mac_optional_gpu_tests_rel" }
     builders { mixins: "mac-try" name: "mac_upload_clang" }
 
     builders { mixins: "win-try" name: "win10_chromium_x64_rel_ng" }