Run gles2_conform_test on optional GPU tryservers.

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 583 matching lines @@
   },
   'content_gl_tests': {'args': ['--use-gpu-in-tests']},
   # TODO(kbr): content_unittests is killing the Linux GPU swarming
   # bots. crbug.com/582094 . It's not useful now anyway until audio
   # hardware is deployed on the swarming bots, so stop running it
   # everywhere.
   # 'content_unittests': {},
   'gl_tests': {'args': ['--use-gpu-in-tests']},
   'gl_unittests': {'args': ['--use-gpu-in-tests']},
   # The gles2_conform_tests are closed-source and deliberately only run
-  # on the FYI waterfall.
+  # on the FYI waterfall and the optional tryservers.
   'gles2_conform_test': {
     'tester_configs': [
       {
         'fyi_only': True,
+        # Run this on the optional tryservers.
+        'run_on_optional': True,
       }
     ],
     'args': ['--use-gpu-in-tests']
   },
   'gles2_conform_d3d9_test': {
     'tester_configs': [
       {
         'fyi_only': True,
-        'os_types': ['win']
+        'os_types': ['win'],
+        # Run this on the optional tryservers.
+        'run_on_optional': True,
       }
     ],
     'args': [
       '--use-gpu-in-tests',
       '--use-angle=d3d9',
     ],
     'test': 'gles2_conform_test',
   },
   'gles2_conform_gl_test': {
     'tester_configs': [
       {
         'fyi_only': True,
-        'os_types': ['win']
+        'os_types': ['win'],
+        # Run this on the optional tryservers.
+        'run_on_optional': True,
       }
     ],
     'args': [
       '--use-gpu-in-tests',
       '--use-angle=gl',
       '--disable-gpu-sandbox',
     ],
     'test': 'gles2_conform_test',
   },
   'tab_capture_end2end_tests': {
@@ skipping 69 matching lines @@
     'tester_configs': [
       {
         'allow_on_mac_nvidia': True,
       },
     ],
   },
   'webgl_conformance_d3d9_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
+        'os_types': ['win'],
         'run_on_optional': True,
-        'os_types': ['win']
       }
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-angle=d3d9',
     ],
   },
   'webgl_conformance_gl_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
+        'os_types': ['win'],
         'run_on_optional': True,
-        'os_types': ['win']
       }
     ],
     'disabled_tester_configs': [
       {
         'swarming_dimension_sets': [
           # BUG 555545: Disable webgl_conformance_gl_tests on Win/AMD
           {
             'gpu': '1002:6779',
             'os': 'Windows-2008ServerR2-SP1'
           },
@@ skipping 272 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())