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

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index fd8e1dce9bc6aca784a42f36b6de306a8ae2078e..79d1850f64a0330da7e467510d60f0b1d203a2de 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -150,6 +150,7 @@ FYI_WATERFALL = {
     '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',
@@ -202,6 +203,15 @@ FYI_WATERFALL = {
       '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': {
@@ -221,6 +231,15 @@ FYI_WATERFALL = {
       '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',
@@ -618,6 +637,17 @@ TELEMETRY_TESTS = {
             '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',