testing/buildbot: Add fake Win ANGLE try bots.

These bots will be used to trigger tests on the ANGLE CQ.
Mirrors the design used in the existing files and in
http://crrev.com/c/1326157 .

Only tackles Windows for now. Will be extended to other platforms.

Also adds a few NVIDIA dEQP tests and cleans up some ANGLE test naming.

Bug: 822310
Change-Id: I5638bdc8588bdf3a4716fd45380ad25cc35ee121
Reviewed-on: https://chromium-review.googlesource.com/c/1333995Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607911}

testing/buildbot/generate_buildbot_json.py

@@ -865,6 +865,10 @@ class BBJSONGenerator(object):
     # are defined only to be mirrored into trybots, and don't actually
     # exist on any of the waterfalls or consoles.
     return [
+      'ANGLE GPU Win10 Release (Intel HD 630)',
+      'ANGLE GPU Win10 Release (NVIDIA)',
+      'Dawn GPU Win10 Release (Intel HD 630)',
+      'Dawn GPU Win10 Release (NVIDIA)',
       'Optional Android Release (Nexus 5X)',
       'Optional Linux Release (Intel HD 630)',
       'Optional Linux Release (NVIDIA)',
@@ -873,8 +877,6 @@ class BBJSONGenerator(object):
       'Optional Mac Retina Release (NVIDIA)',
       'Optional Win10 Release (Intel HD 630)',
       'Optional Win10 Release (NVIDIA)',
-      'Dawn GPU Win10 Release (Intel HD 630)',
-      'Dawn GPU Win10 Release (NVIDIA)',
       'Win7 ANGLE Tryserver (AMD)',
       # chromium.fyi
       'linux-blink-rel-dummy',

testing/buildbot/test_suites.pyl

@@ -1237,6 +1237,20 @@
       },
     },
 
+    'gpu_angle_end2end_tests': {
+      'angle_end2end_tests': {
+        'desktop_args': [
+          '--use-gpu-in-tests',
+          # ANGLE test retries deliberately disabled to prevent flakiness.
+          # http://crbug.com/669196
+          '--test-launcher-retry-limit=0'
+        ],
+        'swarming': {
+          'shards': 4,
+        },
+      },
+    },
+
     'gpu_angle_fyi_and_optional_win_specific_isolated_scripts': {
       # TODO(jmadill): Run on Linux bots when possible.
       'passthrough_command_buffer_perftests': {
@@ -1272,6 +1286,19 @@
       },
     },
 
+    'gpu_angle_white_box_tests': {
+      # TODO(ynovikov): the old generator script said the white box
+      # tests are supposed to run everywhere angle_end2end_tests do, but
+      # they actually ran only on Windows and Linux.
+      'angle_white_box_tests': {
+        'desktop_args': [
+          # ANGLE test retries deliberately disabled to prevent flakiness.
+          # http://crbug.com/669196
+        '--test-launcher-retry-limit=0'
+        ],
+      },
+    },
+
     'gpu_common_and_optional_telemetry_tests': {
       'info_collection': {
         'args': [
@@ -1337,33 +1364,6 @@
       },
     },
 
-    'gpu_fyi_and_optional_and_win_angle_amd_gtests': {
-      'angle_end2end_tests': {
-        'desktop_args': [
-          '--use-gpu-in-tests',
-          # ANGLE test retries deliberately disabled to prevent flakiness.
-          # http://crbug.com/669196
-          '--test-launcher-retry-limit=0'
-        ],
-        'swarming': {
-          'shards': 4,
-        },
-      },
-    },
-
-    'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests': {
-      # TODO(ynovikov): the old generator script said the white box
-      # tests are supposed to run everywhere angle_end2end_tests do, but
-      # they actually ran only on Windows and Linux.
-      'angle_white_box_tests': {
-        'desktop_args': [
-          # ANGLE test retries deliberately disabled to prevent flakiness.
-          # http://crbug.com/669196
-        '--test-launcher-retry-limit=0'
-        ],
-      },
-    },
-
     'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests': {
       'webgl_conformance_d3d11_validating': {
         'telemetry_test_name': 'webgl_conformance',
@@ -2678,17 +2678,58 @@
       'gpu_angle_deqp_egl_gl_tests',
       'gpu_angle_deqp_egl_vulkan_tests',
       'gpu_angle_deqp_gles2_d3d11_tests',
-      # TODO(kbr): why is gpu_angle_deqp_gles2_gl_tests not here?
+      'gpu_angle_deqp_gles2_gl_tests',
       'gpu_angle_deqp_gles2_vulkan_tests',
       'gpu_angle_deqp_gles31_d3d11_tests',
       'gpu_angle_deqp_gles31_gl_tests',
       'gpu_angle_deqp_gles3_d3d11_tests',
-      # TODO(kbr): why is gpu_angle_deqp_gles3_gl_tests not here?
+      'gpu_angle_deqp_gles3_gl_tests',
     ],
 
     'gpu_angle_gtests': [
+      'gpu_angle_end2end_tests',
+      'gpu_angle_unittests',
+    ],
+
+    'gpu_angle_win_intel_gtests': [
+      'gpu_angle_deqp_gles2_d3d11_tests',
+      'gpu_angle_end2end_tests',
+      'gpu_angle_unittests',
+      'gpu_angle_white_box_tests',
+      'gpu_fyi_and_optional_win_specific_gtests',
+    ],
+
+    'gpu_angle_win_intel_telemetry_tests': [
+      'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests',
+      'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests',
+      'gpu_fyi_only_win_intel_and_nvidia_release_specific_telemetry_tests',
+      'gpu_fyi_only_win_linux_intel_nvidia_specific_telemetry_tests',
+      'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
+    ],
+
+    'gpu_angle_win_nvidia_gtests': [
+      'gpu_angle_deqp_egl_d3d11_tests',
+      'gpu_angle_deqp_egl_gl_tests',
+      'gpu_angle_deqp_egl_vulkan_tests',
+      'gpu_angle_deqp_gles2_d3d11_tests',
+      'gpu_angle_deqp_gles2_gl_tests',
+      'gpu_angle_deqp_gles2_vulkan_tests',
+      'gpu_angle_deqp_gles31_d3d11_tests',
+      'gpu_angle_deqp_gles31_gl_tests',
+      'gpu_angle_deqp_gles3_d3d11_tests',
+      'gpu_angle_deqp_gles3_gl_tests',
+      'gpu_angle_end2end_tests',
       'gpu_angle_unittests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
+      'gpu_angle_white_box_tests',
+      'gpu_fyi_and_optional_win_specific_gtests',
+    ],
+
+    'gpu_angle_win_nvidia_telemetry_tests': [
+      'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests',
+      'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests',
+      'gpu_fyi_only_win_intel_and_nvidia_release_specific_telemetry_tests',
+      'gpu_fyi_only_win_linux_intel_nvidia_specific_telemetry_tests',
+      'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
     ],
 
     'gpu_common_telemetry_tests': [
@@ -2713,17 +2754,17 @@
     ],
 
     'gpu_fyi_android_and_mac_gtests': [
+      'gpu_angle_end2end_tests',
       'gpu_angle_unittests',
       'gpu_common_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
       'gpu_fyi_and_optional_non_linux_gtests',
     ],
 
     'gpu_fyi_linux_debug_gtests': [
+      'gpu_angle_end2end_tests',
       'gpu_angle_unittests',
+      'gpu_angle_white_box_tests',
       'gpu_common_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
       'gpu_fyi_desktop_specific_gtests',
     ],
 
@@ -2736,41 +2777,41 @@
     ],
 
     'gpu_fyi_linux_optional_gtests': [
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
+      'gpu_angle_end2end_tests',
+      'gpu_angle_white_box_tests',
       'gpu_fyi_desktop_specific_gtests',
     ],
 
     'gpu_fyi_linux_release_gtests': [
+      'gpu_angle_end2end_tests',
       'gpu_angle_unittests',
+      'gpu_angle_white_box_tests',
       'gpu_common_gtests',
       'gpu_desktop_specific_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
       'gpu_fyi_desktop_specific_gtests',
     ],
 
     'gpu_fyi_mac_debug_gtests': [
+      'gpu_angle_end2end_tests',
       'gpu_angle_unittests',
       'gpu_common_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
       'gpu_fyi_and_optional_non_linux_gtests',
       'gpu_fyi_desktop_specific_gtests',
       'gpu_fyi_mac_specific_gtests',
     ],
 
     'gpu_fyi_mac_optional_gtests': [
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
+      'gpu_angle_end2end_tests',
       'gpu_fyi_and_optional_non_linux_gtests',
       'gpu_fyi_desktop_specific_gtests',
       'gpu_fyi_mac_specific_gtests',
     ],
 
     'gpu_fyi_mac_release_gtests': [
+      'gpu_angle_end2end_tests',
       'gpu_angle_unittests',
       'gpu_common_gtests',
       'gpu_desktop_specific_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
       'gpu_fyi_and_optional_non_linux_gtests',
       'gpu_fyi_desktop_specific_gtests',
       'gpu_fyi_mac_specific_gtests',
@@ -2794,11 +2835,11 @@
     ],
 
     'gpu_fyi_win7_gtests': [
+      'gpu_angle_end2end_tests',
       'gpu_angle_unittests',
+      'gpu_angle_white_box_tests',
       'gpu_common_gtests',
       'gpu_desktop_specific_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
       'gpu_fyi_and_optional_non_linux_gtests',
       'gpu_fyi_and_optional_win_specific_gtests',
       'gpu_fyi_desktop_specific_gtests',
@@ -2845,12 +2886,12 @@
     ],
 
     'gpu_fyi_win_gtests': [
+      'gpu_angle_end2end_tests',
       'gpu_angle_unittests',
+      'gpu_angle_white_box_tests',
       'gpu_common_gtests',
       'gpu_default_and_optional_win_specific_gtests',
       'gpu_desktop_specific_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
       'gpu_fyi_and_optional_non_linux_gtests',
       'gpu_fyi_and_optional_win_specific_gtests',
       'gpu_fyi_desktop_specific_gtests',
@@ -2858,9 +2899,9 @@
     ],
 
     'gpu_fyi_win_optional_gtests': [
+      'gpu_angle_end2end_tests',
+      'gpu_angle_white_box_tests',
       'gpu_default_and_optional_win_specific_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
       'gpu_fyi_and_optional_non_linux_gtests',
       'gpu_fyi_and_optional_win_specific_gtests',
       'gpu_fyi_desktop_specific_gtests',
@@ -2892,8 +2933,8 @@
     ],
 
     'gpu_win_angle_amd_gtests': [
-      'gpu_fyi_and_optional_and_win_angle_amd_gtests',
-      'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
+      'gpu_angle_end2end_tests',
+      'gpu_angle_white_box_tests',
     ],
 
     'gpu_win_angle_amd_telemetry_tests': [

testing/buildbot/waterfalls.pyl

@@ -1856,6 +1856,31 @@
   {
     'name': 'chromium.gpu.fyi',
     'machines': {
+      # BEGIN Fake builder used as mirror targets for ANGLE's GPU tryservers
+      'ANGLE GPU Win10 Release (Intel HD 630)': {
+        'os_type': 'win',
+        'browser_config': 'release',
+        'mixins': [
+          'win10_intel_hd_630_stable',
+        ],
+        'test_suites': {
+          'gtest_tests': 'gpu_angle_win_intel_gtests',
+          'gpu_telemetry_tests': 'gpu_angle_win_intel_telemetry_tests',
+        },
+      },
+      'ANGLE GPU Win10 Release (NVIDIA)': {
+        'os_type': 'win',
+        'browser_config': 'release',
+        'mixins': [
+          'win10_nvidia_quadro_p400_stable',
+        ],
+        'test_suites': {
+          'gtest_tests': 'gpu_angle_win_nvidia_gtests',
+          'isolated_scripts': 'gpu_fyi_and_optional_win_isolated_scripts',
+          'gpu_telemetry_tests': 'gpu_angle_win_nvidia_telemetry_tests',
+        },
+      },
+      # END Fake builder used as mirror targets for ANGLE's GPU tryservers
       'Android FYI 32 Vk Release (Nexus 5X)': {
         'os_type': 'android',
         'skip_merge_script': True,