Stop running webgl_conformance_gl_tests on new Win AMD card.

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 1117 matching lines @@
       {
         'fyi_only': True,
         'os_types': ['win'],
         'run_on_optional': True,
       }
     ],
     'disabled_tester_configs': [
       {
         'swarming_dimension_sets': [
           # crbug.com/555545 and crbug.com/649824:
-          # Disable webgl_conformance_gl_tests on older Win/AMD cards.
-          # (They seem to be running fine on newer cards.)
+          # Disable webgl_conformance_gl_tests on some Win/AMD cards.
+          # Always fails on older cards, flaky on newer cards.
           # Note that these must match the GPUs exactly; wildcard
           # matches (i.e., only device ID) aren't supported!
           {
             'gpu': '1002:6779',
             'os': 'Windows-2008ServerR2-SP1'
           },
+          {
+            'gpu': '1002:6613',
+            'os': 'Windows-2008ServerR2-SP1'
+          },
           # BUG 590951: Disable webgl_conformance_gl_tests on Win/Intel
           {
             'gpu': '8086:041a',
             'os': 'Windows-2008ServerR2-SP1'
           },
           {
             'gpu': '8086:0412',
             'os': 'Windows-2008ServerR2-SP1'
           },
         ],
@@ skipping 351 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())