Enable Win10 Experimental Release Intel bot on GPU.FYI waterfall

BUG=838970

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I28a0a55d4fb1d248a53ced7f721df128d470c34f
Reviewed-on: https://chromium-review.googlesource.com/1041164
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557216}

content/test/gpu/generate_buildbot_json.py

@@ -37,8 +37,7 @@ LINUX_QUADRO_P400_STABLE_DRIVER = '10de:1cb3-384.90'
 # Intel HD 630 (both Windows and Linux).
 INTEL_HD_630 = '8086:5912'
 WIN10_INTEL_HD_630_STABLE_DRIVER = '8086:5912-23.20.16.4877'
-# TODO(zmo): Add the following bot.
-# WIN10_INTEL_HD_630_EXPERIMENTAL_DRIVER = '8086:5912-24.20.100.6025'
+WIN10_INTEL_HD_630_EXPERIMENTAL_DRIVER = '8086:5912-24.20.100.6025'
 
 # "Types" of waterfalls and bots. A bot's type is the union of its own
 # type and the type of its waterfall. Predicates can apply to these
@@ -393,6 +392,18 @@ FYI_WATERFALL = {
       'os_type': 'win',
       'type': Types.DEQP,
     },
+    'Win10 FYI Exp Release (Intel HD 630)': {
+      'swarming_dimensions': [
+        {
+          'gpu': WIN10_INTEL_HD_630_EXPERIMENTAL_DRIVER,
+          'os': 'Windows-10',
+          'pool': 'Chrome-GPU',
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'win',
+    },
     'Win10 FYI Release (Intel HD 630)': {
       'swarming_dimensions': [
         {
@@ -1818,6 +1829,7 @@ COMMON_GTESTS = {
       {
         'names': [
           'Win10 FYI Release (Intel HD 630)',
+          'Win10 FYI Exp Release (Intel HD 630)',
         ],
       },
     ],

infra/config/global/cr-buildbucket.cfg

@@ -1143,6 +1143,10 @@ buckets {
       name: "Win10 FYI Release (Intel HD 630)"
       mixins: "win-gpu-fyi-ci"
     }
+    builders {
+      name: "Win10 FYI Exp Release (Intel HD 630)"
+      mixins: "win-gpu-fyi-ci"
+    }
     builders {
       name: "Win10 FYI Release (NVIDIA)"
       mixins: "win-gpu-fyi-ci"

infra/config/global/luci-milo.cfg

@@ -2723,18 +2723,23 @@ consoles: {
   }
   builders: {
     name: "buildbucket/luci.chromium.ci/Win10 FYI Debug (NVIDIA)"
-    category: "Windows|10"
-    short_name: "nvi"
+    category: "Windows|10|Nvidia"
+    short_name: "dbg"
   }
   builders: {
     name: "buildbucket/luci.chromium.ci/Win10 FYI Release (Intel HD 630)"
-    category: "Windows|10|Release"
-    short_name: "int"
+    category: "Windows|10|Intel"
+    short_name: "rel"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Exp Release (Intel HD 630)"
+    category: "Windows|10|Intel"
+    short_name: "exp"
   }
   builders: {
     name: "buildbucket/luci.chromium.ci/Win10 FYI Release (NVIDIA)"
-    category: "Windows|10|Release"
-    short_name: "nvi"
+    category: "Windows|10|Nvidia"
+    short_name: "rel"
   }
   builders: {
     name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (AMD)"

infra/config/global/luci-scheduler.cfg

@@ -1405,6 +1405,17 @@ job {
   noop: {}
 }
 
+job {
+  id: "Win10 FYI Exp Release (Intel HD 630)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI Exp Release (Intel HD 630)"
+  }
+}
+
 job {
   id: "Win10 FYI Exp Release (NVIDIA)"
   # Triggered by "GPU FYI Win Builder"