Deploy Mac ASAN bot on chromium.gpu.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 70 matching lines @@
       ],
       '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'
+          'os': 'Mac'
         },
       ],
       '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'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'mac',
     },
     'Linux Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
@@ skipping 255 matching lines @@
       ],
       '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'
+          'os': 'Mac'
         },
       ],
       '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'
+          'os': 'Mac'
         },
       ],
       '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'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off for testing purposes.
       'swarming': False,
       'os_type': 'mac',
     },
+    'Mac GPU ASAN Release': {
+      # This bot spawns jobs on multiple GPU types.
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.10'
+        },
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+    },
     'Linux Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
           'os': 'Linux'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'linux',
@@ skipping 223 matching lines @@
       ],
       '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'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
     'Optional Linux Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
@@ skipping 714 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())