Make per-bot swarming_dimensions an array.

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 11 matching lines @@
     'GPU Win Builder',
     'GPU Win 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',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
     'Win7 Debug (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'win',
     },
     'Win7 Release (ATI)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6779',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6779',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
     'Mac 10.10 Release (Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:0a2e',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.10 Debug (Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:0a2e',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.10 Retina Release (AMD)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6821',
-        'hidpi': '1',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.10 Retina Debug (AMD)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6821',
-        'hidpi': '1',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'mac',
     },
     'Linux Release (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'linux',
     },
     'Linux Debug (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       '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)',
     'Linux ChromiumOS Builder',
    ],
 
   'testers': {
     'Win7 Release (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
     'Win7 Debug (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'win',
     },
     'Win8 Release (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Windows-2012ServerR2-SP0'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Windows-2012ServerR2-SP0'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
     'Win8 Debug (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Windows-2012ServerR2-SP0'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Windows-2012ServerR2-SP0'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'win',
     },
     'Win7 Release (ATI)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6779',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      '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'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6779',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'win',
     },
     'Win7 Release (Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:041a',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:041a',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
     'Win7 Release (NVIDIA GeForce 730)': {
-      'swarming_dimensions': {
-        'gpu': '10de:0f02',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:0f02',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
     'Win7 Release (New Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:0412',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0412',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
     'Win7 Debug (New Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:0412',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0412',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Debug',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
     'Win7 Release (AMD R7 240)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6613',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6613',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
     'Win7 x64 Release (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      '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'
-      },
+      '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'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.10 Debug (Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:0a2e',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.10 Release (ATI)': {
-      'swarming_dimensions': {
-        'gpu': '1002:679e',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:679e',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'mac',
     },
     'Mac 10.10 Debug (ATI)': {
-      'swarming_dimensions': {
-        'gpu': '1002:679e',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:679e',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Debug',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'mac',
     },
     'Mac Retina Release': {
-      'swarming_dimensions': {
-        'gpu': '10de:0fe9',
-        'hidpi': '1',
-        'os': 'Mac'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:0fe9',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac Retina Debug': {
-      'swarming_dimensions': {
-        'gpu': '10de:0fe9',
-        'hidpi': '1',
-        'os': 'Mac'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:0fe9',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.10 Retina Release (AMD)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6821',
-        'hidpi': '1',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.10 Retina Debug (AMD)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6821',
-        'hidpi': '1',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'mac',
     },
     'Mac 10.11 Retina Release (AMD)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6821',
-        'hidpi': '1',
-        'os': 'Mac-10.11'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac-10.11'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off for testing purposes.
       'swarming': False,
       'os_type': 'mac',
     },
     'Linux Release (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'linux',
     },
     'Linux Release (Intel Graphics Stack)': {
-      'swarming_dimensions': {
-        'gpu': '8086:041a',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:041a',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'linux',
     },
     'Linux Release (ATI)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6779',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6779',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'linux',
     },
     'Linux Release (NVIDIA GeForce 730)': {
-      'swarming_dimensions': {
-        'gpu': '10de:0f02',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:0f02',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'linux',
     },
     'Linux Debug (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'linux',
     },
     'Linux Release (New Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:0412',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0412',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'linux',
     },
     'Linux Debug (New Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:0412',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0412',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Debug',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'linux',
     },
     'Linux Release (AMD R7 240)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6613',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6613',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'linux',
     },
     'Android Release (Nexus 5)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
+      'swarming_dimensions': [
+        {
+          # There are no PCI IDs on Android.
+          # This is a hack to get the script working.
+          'gpu': '0000:0000',
+          'os': 'Android'
+        },
+      ],
       'build_config': 'android-chromium',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'android',
     },
     'Android Release (Nexus 5X)': {
-      'swarming_dimensions': {
-        'device_type': 'bullhead',
-        'device_os': 'M',
-        'os': 'Android'
-      },
+      'swarming_dimensions': [
+        {
+          'device_type': 'bullhead',
+          'device_os': 'M',
+          'os': 'Android'
+        },
+      ],
       'build_config': 'android-chromium',
       'swarming': True,
       'os_type': 'android',
     },
     'Android Release (Nexus 6)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
+      'swarming_dimensions': [
+        {
+          # There are no PCI IDs on Android.
+          # This is a hack to get the script working.
+          'gpu': '0000:0000',
+          'os': 'Android'
+        },
+      ],
       'build_config': 'android-chromium',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'android',
     },
     'Android Release (Nexus 6P)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
+      'swarming_dimensions': [
+        {
+          # There are no PCI IDs on Android.
+          # This is a hack to get the script working.
+          'gpu': '0000:0000',
+          'os': 'Android'
+        },
+      ],
       'build_config': 'android-chromium',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'android',
     },
     'Android Release (Nexus 9)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
+      'swarming_dimensions': [
+        {
+          # There are no PCI IDs on Android.
+          # This is a hack to get the script working.
+          'gpu': '0000:0000',
+          'os': 'Android'
+        },
+      ],
       'build_config': 'android-chromium',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'android',
     },
     'Android Release (Pixel C)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
+      'swarming_dimensions': [
+        {
+          # There are no PCI IDs on Android.
+          # This is a hack to get the script working.
+          'gpu': '0000:0000',
+          'os': 'Android'
+        },
+      ],
       'build_config': 'android-chromium',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'android',
     },
 
     # The following "optional" testers don't actually exist on the
     # waterfall. They are present here merely to specify additional
     # tests which aren't on the main tryservers. Unfortunately we need
     # a completely different (redundant) bot specification to handle
     # this.
     'Optional Win7 Release (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
     'Optional Win7 Release (ATI)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6779',
-        'os': 'Windows-2008ServerR2-SP1'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6779',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
     'Optional Mac 10.10 Release (Intel)': {
-      'swarming_dimensions': {
-        'gpu': '8086:0a2e',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Optional Mac Retina Release': {
-      'swarming_dimensions': {
-        'gpu': '10de:0fe9',
-        'hidpi': '1',
-        'os': 'Mac'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:0fe9',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Optional Mac 10.10 Retina Release (AMD)': {
-      'swarming_dimensions': {
-        'gpu': '1002:6821',
-        'hidpi': '1',
-        'os': 'Mac-10.10'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac-10.10'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Optional Linux Release (NVIDIA)': {
-      'swarming_dimensions': {
-        'gpu': '10de:104a',
-        'os': 'Linux'
-      },
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Linux'
+        },
+      ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'linux',
     },
   }
 }
 
 COMMON_GTESTS = {
   'angle_deqp_egl_tests': {
     'tester_configs': [
@@ skipping 213 matching lines @@
 # recipe supported running isolates locally. crbug.com/581953
 
 NON_SWARMED_GTESTS = {
   'tab_capture_end2end_tests': {
      'test': 'browser_tests',
      'args': [
        '--enable-gpu',
        '--test-launcher-jobs=1',
        '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
            'TabCaptureApiPixelTest.EndToEnd*'
-     ]
+     ],
+     'swarming': {
+       'can_use_on_swarming_builders': False,
+     },
   }
 }
 
 TELEMETRY_TESTS = {
   'context_lost': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ]
@@ skipping 224 matching lines @@
   """Substitutes the ${os_type} variable in |args| from the
      tester_config's "os_type" property.
   """
   substitutions = {
     'os_type': tester_config['os_type']
   }
   return [string.Template(arg).safe_substitute(substitutions) for arg in args]
 
 def matches_swarming_dimensions(tester_config, dimension_sets):
   for dimensions in dimension_sets:
-    if set(dimensions.items()).issubset(
-        tester_config['swarming_dimensions'].items()):
-      return True
+    for cur_dims in tester_config['swarming_dimensions']:
+      if set(dimensions.items()).issubset(cur_dims.items()):
+        return True
   return False
 
 def is_android(tester_config):
   return tester_config['os_type'] == 'android'
 
 def tester_config_matches_tester(tester_name, tester_config, tc, is_fyi,
                                  check_waterfall):
   if check_waterfall:
     if tc.get('fyi_only', False) and not is_fyi:
       return False
@@ skipping 62 matching lines @@
     # Need to override this result.
     result = copy.deepcopy(NON_SWARMED_GTESTS[test])
     result['name'] = test
   else:
     # Put the swarming dimensions in anyway. If the tester is later
     # swarmed, they will come in handy.
     if not 'swarming' in result:
       result['swarming'] = {}
     result['swarming'].update({
       'can_use_on_swarming_builders': True,
-      'dimension_sets': [
-        tester_config['swarming_dimensions']
-      ]
+      'dimension_sets': tester_config['swarming_dimensions']
     })
     if is_android(tester_config):
       # Override the isolate target to get rid of any "_apk" suffix
       # that would be added by the recipes.
       result['override_isolate_target'] = test
       # Integrate with the unified logcat system.
       result['swarming'].update({
         'cipd_packages': [
           {
             'cipd_package': 'infra/tools/luci/logdog/butler/${platform}',
@@ skipping 57 matching lines @@
   benchmark_name = test_config.get('target_name') or test
   prefix_args = [
     benchmark_name,
     '--show-stdout',
     '--browser=%s' % tester_config['build_config'].lower()
   ]
   swarming = {
     # Always say this is true regardless of whether the tester
     # supports swarming. It doesn't hurt.
     'can_use_on_swarming_builders': True,
-    'dimension_sets': [
-      tester_config['swarming_dimensions']
-    ]
+    'dimension_sets': tester_config['swarming_dimensions']
   }
   if 'swarming' in test_config:
     swarming.update(test_config['swarming'])
   result = {
     'args': prefix_args + test_args,
     'isolate_name': (
       'telemetry_gpu_integration_test' if use_gpu_integration_test_harness
       else 'telemetry_gpu_test'),
     'name': step_name,
     'override_compile_targets': [
@@ skipping 56 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())