Temporarily disable angle_vulkan_deqp_tests.

Unblocks the Vulkan roll (issues with http://crbug.com/643346).

Bug: angleproject:2393
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Tbr: kbr@chromium.org
No-Try: True
Change-Id: Icd41d0ba9abbbdd5a8d52e9f391716dbef674a34
Reviewed-on: https://chromium-review.googlesource.com/951648Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541458}

content/test/gpu/generate_buildbot_json.py

@@ -1260,45 +1260,47 @@ COMMON_GTESTS = {
     ],
   },
 
-  'angle_deqp_gles2_vulkan_tests': {
-    'tester_configs': [
-      {
-        'predicate': Predicates.DEQP,
-        'swarming_dimension_sets': [
-          # NVIDIA Win 10
-          {
-            'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS,
-            'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
-          },
-          # AMD Win 7
-          {
-            'gpu': '1002:6613',
-            'os': 'Windows-2008ServerR2-SP1'
-          },
-          # NVIDIA Linux Quadro P400
-          {
-            'gpu': LINUX_QUADRO_P400_STABLE_DRIVER,
-            'os': 'Ubuntu'
-          },
-        ],
-      },
-    ],
-    'disabled_tester_configs': [
-      {
-        'names': [
-          'Linux FYI Ozone (Intel)',
-        ],
-      },
-    ],
-    'desktop_swarming': {
-      'shards': 4,
-    },
-    'test': 'angle_deqp_gles2_tests',
-    'args': [
-      '--test-launcher-batch-limit=400',
-      '--deqp-egl-display-type=angle-vulkan'
-    ]
-  },
+  # Temporarily disabled while we roll Vulkan.
+  # TODO(jmadill): Re-enable after roll. http://anglebug.com/2393
+  # 'angle_deqp_gles2_vulkan_tests': {
+  #   'tester_configs': [
+  #     {
+  #       'predicate': Predicates.DEQP,
+  #       'swarming_dimension_sets': [
+  #         # NVIDIA Win 10
+  #         {
+  #           'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS,
+  #           'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
+  #         },
+  #         # AMD Win 7
+  #         {
+  #           'gpu': '1002:6613',
+  #           'os': 'Windows-2008ServerR2-SP1'
+  #         },
+  #         # NVIDIA Linux Quadro P400
+  #         {
+  #           'gpu': LINUX_QUADRO_P400_STABLE_DRIVER,
+  #           'os': 'Ubuntu'
+  #         },
+  #       ],
+  #     },
+  #   ],
+  #   'disabled_tester_configs': [
+  #     {
+  #       'names': [
+  #         'Linux FYI Ozone (Intel)',
+  #       ],
+  #     },
+  #   ],
+  #   'desktop_swarming': {
+  #     'shards': 4,
+  #   },
+  #   'test': 'angle_deqp_gles2_tests',
+  #   'args': [
+  #     '--test-launcher-batch-limit=400',
+  #     '--deqp-egl-display-type=angle-vulkan'
+  #   ]
+  # },
 
   'angle_deqp_gles3_gles_tests': {
     'tester_configs': [

testing/buildbot/chromium.gpu.fyi.json

@@ -5672,26 +5672,6 @@
         "test": "angle_deqp_gles2_tests",
         "use_xvfb": false
       },
-      {
-        "args": [
-          "--test-launcher-batch-limit=400",
-          "--deqp-egl-display-type=angle-vulkan"
-        ],
-        "name": "angle_deqp_gles2_vulkan_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "10de:1cb3-384.90",
-              "os": "Ubuntu",
-              "pool": "Chrome-GPU"
-            }
-          ],
-          "shards": 4
-        },
-        "test": "angle_deqp_gles2_tests",
-        "use_xvfb": false
-      },
       {
         "args": [
           "--test-launcher-batch-limit=400",
@@ -15113,26 +15093,6 @@
         "test": "angle_deqp_gles2_tests",
         "use_xvfb": false
       },
-      {
-        "args": [
-          "--test-launcher-batch-limit=400",
-          "--deqp-egl-display-type=angle-vulkan"
-        ],
-        "name": "angle_deqp_gles2_vulkan_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "10de:1cb3-23.21.13.8816",
-              "os": "Windows-10",
-              "pool": "Chrome-GPU"
-            }
-          ],
-          "shards": 4
-        },
-        "test": "angle_deqp_gles2_tests",
-        "use_xvfb": false
-      },
       {
         "args": [
           "--test-launcher-batch-limit=400",
@@ -18287,26 +18247,6 @@
         },
         "test": "angle_deqp_gles2_tests",
         "use_xvfb": false
-      },
-      {
-        "args": [
-          "--test-launcher-batch-limit=400",
-          "--deqp-egl-display-type=angle-vulkan"
-        ],
-        "name": "angle_deqp_gles2_vulkan_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "1002:6613",
-              "os": "Windows-2008ServerR2-SP1",
-              "pool": "Chrome-GPU"
-            }
-          ],
-          "shards": 4
-        },
-        "test": "angle_deqp_gles2_tests",
-        "use_xvfb": false
       }
     ],
     "isolated_scripts": []