Add manually-triggered trybots for Android GPU.FYI bots.

Bug: 869557, 870840
Change-Id: I3da61f9ee1e632e8aec68ad0d07ebc4ffab4487a
Reviewed-on: https://chromium-review.googlesource.com/1185985Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585355}

infra/config/global/cr-buildbucket.cfg

@@ -175,6 +175,13 @@ builder_mixins {
   mixins: "gpu-fyi-ci"
 }
 
+builder_mixins {
+  name: "android-gpu-manual-try"
+  mixins: "android-optional-gpu-try"
+  # Increase timeout to allow tryjobs against small number of phones.
+  mixins: "gpu-slow-bot"
+}
+
 builder_mixins {
   name: "android-optional-gpu-try"
   dimensions: "os:Ubuntu-14.04"
@@ -627,6 +634,8 @@ buckets {
     builders {
       name: "Android FYI Release (Nexus 5)"
       mixins: "android-gpu-fyi-ci"
+      # Increase timeout to allow tryjobs against small number of phones.
+      mixins: "gpu-slow-bot"
     }
 
     builders {
@@ -637,21 +646,29 @@ buckets {
     builders {
       name: "Android FYI Release (Nexus 6)"
       mixins: "android-gpu-fyi-ci"
+      # Increase timeout to allow tryjobs against small number of phones.
+      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI Release (Nexus 6P)"
       mixins: "android-gpu-fyi-ci"
+      # Increase timeout to allow tryjobs against small number of phones.
+      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI Release (Nexus 9)"
       mixins: "android-gpu-fyi-ci"
+      # Increase timeout to allow tryjobs against small number of phones.
+      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI Release (NVIDIA Shield TV)"
       mixins: "android-gpu-fyi-ci"
+      # Increase timeout to allow tryjobs against small number of phones.
+      mixins: "gpu-slow-bot"
     }
 
     builders {
@@ -2430,11 +2447,41 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
     }
     builders {
-      mixins: "android-optional-gpu-try"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
+      mixins: "android-gpu-manual-try"
+      name: "gpu-manual-try-android-l-nexus-5-32"
+    }
+    builders {
+      mixins: "android-gpu-manual-try"
+      name: "gpu-manual-try-android-l-nexus-6-32"
+    }
+    builders {
+      mixins: "android-gpu-manual-try"
+      name: "gpu-manual-try-android-m-nexus-6p-64"
+    }
+    builders {
+      mixins: "android-gpu-manual-try"
+      name: "gpu-manual-try-android-m-nexus-9-64"
+    }
+    builders {
+      mixins: "android-gpu-manual-try"
+      name: "gpu-manual-try-android-n-nvidia-shield-tv-64"
+    }
+    builders {
+      mixins: "android-gpu-manual-try"
       name: "gpu-manual-try-android-p-pixel-2-32"
     }
+    builders {
+      mixins: "android-gpu-manual-try"
+      name: "gpu-manual-try-android-p-pixel-2-32-deqp"
+    }
+    builders {
+      mixins: "android-gpu-manual-try"
+      name: "gpu-manual-try-android-p-pixel-2-64"
+    }
+    builders {
+      mixins: "android-gpu-manual-try"
+      name: "gpu-manual-try-android-p-pixel-2-64-deqp"
+    }
 
     builders { mixins: "chromeos-try" name: "chromeos-amd64-generic-rel" }
     builders { mixins: "chromeos-try" name: "chromeos-daisy-rel" }

infra/config/global/luci-milo.cfg

@@ -3919,9 +3919,33 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-kitkat-arm-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-l-nexus-5-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-l-nexus-6-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-m-nexus-6p-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-m-nexus-9-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-n-nvidia-shield-tv-64"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32-deqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64-deqp"
+  }
   builder_view_only: true
 }
 
@@ -4521,9 +4545,33 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/fuchsia"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-l-nexus-5-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-l-nexus-6-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-m-nexus-6p-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-m-nexus-9-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-n-nvidia-shield-tv-64"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32-deqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64-deqp"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/gpu_manual_try_win7_nvidia_rel"
   }

tools/mb/mb_config.pyl

@@ -526,7 +526,15 @@
       'android_optional_gpu_tests_rel': 'gpu_tests_android_release_trybot_arm64',
       'android_unswarmed_pixel_aosp': 'android_debug_trybot_arm64',
       'cast_shell_android': 'android_cast_debug_static_bot_compile_only',
+      'gpu-manual-try-android-l-nexus-5-32': 'android_release_trybot',
+      'gpu-manual-try-android-l-nexus-6-32': 'android_release_trybot',
+      'gpu-manual-try-android-m-nexus-6p-64': 'android_release_trybot_arm64',
+      'gpu-manual-try-android-m-nexus-9-64': 'android_release_trybot_arm64',
+      'gpu-manual-try-android-n-nvidia-shield-tv-64': 'android_release_trybot_arm64',
       'gpu-manual-try-android-p-pixel-2-32': 'gpu_tests_android_vulkan_release_trybot',
+      'gpu-manual-try-android-p-pixel-2-32-deqp': 'deqp_android_vulkan_release_trybot',
+      'gpu-manual-try-android-p-pixel-2-64': 'gpu_tests_android_vulkan_release_trybot_arm64',
+      'gpu-manual-try-android-p-pixel-2-64-deqp': 'deqp_android_vulkan_release_trybot_arm64',
       'linux_android_dbg_ng': 'android_debug_trybot',
     },