Deploy new Win x64 (dbg) and Win7 Debug (ATI) bots on FYI waterfall.

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 132 matching lines @@
       'os_type': 'linux',
     },
   }
 }
 
 FYI_WATERFALL = {
   'builders': [
     'GPU Win Builder',
     'GPU Win Builder (dbg)',
     'GPU Win x64 Builder',
+    'GPU Win x64 Builder (dbg)',
     'GPU Mac Builder',
     'GPU Mac Builder (dbg)',
     'GPU Linux Builder',
     'GPU Linux Builder (dbg)',
    ],
 
   'testers': {
     'Win7 Release (NVIDIA)': {
       'swarming_dimensions': {
         'gpu': '10de:104a',
@@ skipping 32 matching lines @@
     },
     'Win7 Release (ATI)': {
       'swarming_dimensions': {
         'gpu': '1002:6779',
         'os': 'Windows-2008ServerR2-SP1'
       },
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
+    'Win7 Debug (ATI)': {
+      'swarming_dimensions': {
+        'gpu': '1002:6779',
+        'os': 'Windows-2008ServerR2-SP1'
+      },
+      'build_config': 'Debug',
+      'swarming': True,
+      'os_type': 'win',
+    },
     'Win7 Release dEQP (NVIDIA)': {
       'deqp': True,
       'swarming_dimensions': {
         'gpu': '10de:104a',
         'os': 'Windows-2008ServerR2-SP1'
       },
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
     'Win7 x64 Release (NVIDIA)': {
       'swarming_dimensions': {
         'gpu': '10de:104a',
         'os': 'Windows-2008ServerR2-SP1'
       },
       'build_config': 'Release_x64',
       'swarming': True,
       'os_type': 'win',
     },
+    'Win7 x64 Debug (NVIDIA)': {
+      'swarming_dimensions': {
+        'gpu': '10de:104a',
+        'os': 'Windows-2008ServerR2-SP1'
+      },
+      'build_config': 'Debug_x64',
+      'swarming': True,
+      'os_type': 'win',
+    },
     'Mac 10.10 Release (Intel)': {
       'swarming_dimensions': {
         'gpu': '8086:0a2e',
         'os': 'Mac-10.10'
       },
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.10 Debug (Intel)': {
@@ skipping 377 matching lines @@
     ],
     'disabled_tester_configs': [
       {
         # BUG 555545: Disable webgl_conformance_gl_tests on Win/AMD
         'swarming_dimension_sets': [
           {
             'gpu': '1002:6779',
             'os': 'Windows-2008ServerR2-SP1'
           },
         ],
+      },
+      {
+        # BUG 555545: Disable webgl_conformance_gl_tests on Win/AMD
+        # Need another entry to match the optional tryservers.
+        'run_on_optional': True,
+        'swarming_dimension_sets': [
+          {
+            'gpu': '1002:6779',
+            'os': 'Windows-2008ServerR2-SP1'
+          },
+        ],
       }
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-angle=gl',
     ],
   },
   'webgl_conformance_angle_tests': {
     'tester_configs': [
       {
@@ skipping 211 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())