Deploy LUCI versions of remaining chromium.gpu bots.

Some of these will need to live in the side-by-side console until the
related tryservers (win7_chromium_rel_ng and android_n5x_swarming_rel)
are migrated.

Remove a couple of fully-migrated LUCI bots from the chromium.gpu
console.

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

infra/config/global/cr-buildbucket.cfg

@@ -133,6 +133,14 @@ builder_mixins {
   mixins: "angle-try"
 }
 
+builder_mixins {
+  name: "android-gpu-ci"
+  dimensions: "os:Ubuntu-14.04"
+  recipe {
+    properties: "mastername:chromium.gpu"
+  }
+}
+
 builder_mixins {
   name: "android-gpu-fyi-ci"
   dimensions: "os:Ubuntu-14.04"
@@ -387,6 +395,14 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "win-gpu-ci"
+  mixins: "win"
+  recipe {
+    properties: "mastername:chromium.gpu"
+  }
+}
+
 # GPU bots run very long tests sometimes on a single tester. The regular
 # timeout isn't enough on some testers during the migration when they run both
 # the buildbot and LUCI tests. Double the timeout for them.
@@ -524,6 +540,11 @@ buckets {
       mixins: "android-gpu-fyi-ci"
     }
 
+    builders {
+      name: "Android Release (Nexus 5X)"
+      mixins: "android-gpu-ci"
+    }
+
     builders {
       name: "Android Tests (trial)(dbg)"
       mixins: "android-fyi-ci"
@@ -712,11 +733,6 @@ buckets {
       }
     }
 
-    builders {
-      name: "GPU Linux Builder"
-      mixins: "linux-gpu-ci"
-    }
-
     builders {
       name: "Deterministic Linux"
       mixins: "linux-ci"
@@ -762,11 +778,6 @@ buckets {
       dimensions: "cores:32"
     }
 
-    builders {
-      name: "Linux Release (NVIDIA)"
-      mixins: "linux-gpu-ci"
-    }
-
     builders {
       name: "Linux Tests"
       mixins: "linux-ci"
@@ -854,6 +865,28 @@ buckets {
       mixins: "memory-ci"
     }
 
+    # chromium.gpu
+    builders {
+      name: "GPU Linux Builder"
+      mixins: "linux-gpu-ci"
+    }
+
+    builders {
+      name: "GPU Linux Builder (dbg)"
+      mixins: "linux-gpu-ci"
+    }
+
+    builders {
+      name: "Linux Debug (NVIDIA)"
+      mixins: "linux-gpu-ci"
+    }
+
+    builders {
+      name: "Linux Release (NVIDIA)"
+      mixins: "linux-gpu-ci"
+    }
+
+    # chromium.gpu.fyi
     builders {
       name: "GPU FYI Linux Builder"
       mixins: "linux-gpu-fyi-ci"
@@ -1133,6 +1166,26 @@ buckets {
       dimensions: "cpu:x86-64"
       dimensions: "cores:8"
     }
+
+    # chromium.gpu
+    builders {
+      name: "GPU Win Builder"
+      mixins: "win-gpu-ci"
+    }
+    builders {
+      name: "GPU Win Builder (dbg)"
+      mixins: "win-gpu-ci"
+    }
+    builders {
+      name: "Win10 Debug (NVIDIA)"
+      mixins: "win-gpu-ci"
+    }
+    builders {
+      name: "Win10 Release (NVIDIA)"
+      mixins: "win-gpu-ci"
+    }
+
+    # chromium.gpu.fyi
     builders {
       name: "GPU FYI Win Builder"
       mixins: "win-gpu-fyi-ci"

infra/config/global/luci-milo.cfg

@@ -1696,6 +1696,76 @@ consoles {
     category: "android|builder|arm|tester|32"
     short_name: "bb"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Win Builder"
+    category: "gpu|win|release|builder"
+    short_name: "ci"
+  }
+  builders {
+    name: "buildbot/chromium.gpu/GPU Win Builder"
+    category: "gpu|win|release|builder"
+    short_name: "bb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Win Builder (dbg)"
+    category: "gpu|win|debug|builder"
+    short_name: "ci"
+  }
+  builders {
+    name: "buildbot/chromium.gpu/GPU Win Builder (dbg)"
+    category: "gpu|win|debug|builder"
+    short_name: "bb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 Release (NVIDIA)"
+    category: "gpu|win|release|tester"
+    short_name: "ci"
+  }
+  builders {
+    name: "buildbot/chromium.gpu/Win10 Release (NVIDIA)"
+    category: "gpu|win|release|tester"
+    short_name: "bb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 Debug (NVIDIA)"
+    category: "gpu|win|debug|tester"
+    short_name: "ci"
+  }
+  builders {
+    name: "buildbot/chromium.gpu/Win10 Debug (NVIDIA)"
+    category: "gpu|win|debug|tester"
+    short_name: "bb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Linux Builder (dbg)"
+    category: "gpu|linux|debug|builder"
+    short_name: "ci"
+  }
+  builders {
+    name: "buildbot/chromium.gpu/GPU Linux Builder (dbg)"
+    category: "gpu|linux|debug|builder"
+    short_name: "bb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Debug (NVIDIA)"
+    category: "gpu|linux|debug|tester"
+    short_name: "ci"
+  }
+  builders {
+    name: "buildbot/chromium.gpu/Linux Debug (NVIDIA)"
+    category: "gpu|linux|debug|tester"
+    short_name: "bb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android Release (Nexus 5X)"
+    category: "gpu|android|release"
+    short_name: "ci"
+  }
+  builders {
+    name: "buildbot/chromium.gpu/Android Release (Nexus 5X)"
+    category: "gpu|android|release"
+    short_name: "bb"
+  }
   include_experimental_builds: true
 }
 
@@ -2826,7 +2896,6 @@ consoles {
     category: "Mac"
   }
   builders {
-    name: "buildbot/chromium.gpu/GPU Linux Builder"
     name: "buildbucket/luci.chromium.ci/GPU Linux Builder"
     category: "Linux"
   }
@@ -2841,7 +2910,6 @@ consoles {
     category: "Linux"
   }
   builders {
-    name: "buildbot/chromium.gpu/Linux Release (NVIDIA)"
     name: "buildbucket/luci.chromium.ci/Linux Release (NVIDIA)"
     category: "Linux"
   }

infra/config/global/luci-scheduler.cfg

@@ -67,6 +67,7 @@ trigger {
   triggers: "Android FYI Release (Nexus 6P)"
   triggers: "Android FYI Release (Nexus 9)"
   triggers: "Android FYI Release (NVIDIA Shield TV)"
+  triggers: "Android Release (Nexus 5X)"
   triggers: "Android x64 Builder (dbg)"
   triggers: "Android x86 Builder (dbg)"
   triggers: "android-kitkat-arm-rel"
@@ -98,6 +99,7 @@ trigger {
   triggers: "GPU FYI Linux dEQP Builder"
   triggers: "GPU FYI Linux Ozone Builder"
   triggers: "GPU Linux Builder"
+  triggers: "GPU Linux Builder (dbg)"
   triggers: "Headless Linux (dbg)"
   triggers: "Leak Detection Linux"
   triggers: "linux-blink-heap-incremental-marking"
@@ -133,6 +135,8 @@ trigger {
   triggers: "GPU FYI Win x64 Builder"
   triggers: "GPU FYI Win x64 Builder (dbg)"
   triggers: "GPU FYI Win x64 dEQP Builder"
+  triggers: "GPU Win Builder"
+  triggers: "GPU Win Builder (dbg)"
   triggers: "win-jumbo-rel"
   triggers: "Win Builder"
   triggers: "Win Builder (dbg)"
@@ -296,6 +300,16 @@ job {
   }
 }
 
+job {
+  id: "Android Release (Nexus 5X)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android Release (Nexus 5X)"
+  }
+}
+
 job {
   id: "Android Tests (trial)(dbg)"
   # triggered by "Android arm Builder (dbg)"
@@ -854,6 +868,27 @@ job {
   }
 }
 
+job {
+  id: "GPU Linux Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Linux Builder (dbg)"
+  }
+}
+
+job {
+  id: "Linux Debug (NVIDIA)"
+  # Triggered by "GPU Linux Builder (dbg)".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Debug (NVIDIA)"
+  }
+}
+
 job {
   id: "Headless Linux (dbg)"
   acl_sets: "default"
@@ -1660,6 +1695,48 @@ job {
   }
 }
 
+job {
+  id: "GPU Win Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Win Builder"
+  }
+}
+
+job {
+  id: "Win10 Release (NVIDIA)"
+  # Triggered by "GPU Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "GPU Win Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Win Builder (dbg)"
+  }
+}
+
+job {
+  id: "Win10 Debug (NVIDIA)"
+  # Triggered by "GPU Win Builder (dbg)"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 Debug (NVIDIA)"
+  }
+}
+
 job {
   id: "Win Builder (dbg)"
   acl_sets: "default"