Clean up now-incorrect names of many of the Mac GPU bots.

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 74 matching lines @@
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'win',
     },
+    'Mac Release (Intel)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.12'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Debug (Intel)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.12'
+        },
+      ],
+      'build_config': 'Debug',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Retina Release (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Retina Debug (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Debug',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    # BEGIN obsolete Mac bots -- remove after waterfall restarted successfully.
     'Mac 10.10 Release (Intel)': {
       'swarming_dimensions': [
         {
           'gpu': '8086:0a2e',
           'os': 'Mac-10.12'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
@@ skipping 26 matching lines @@
         {
           'gpu': '1002:6821',
           'hidpi': '1',
           'os': 'Mac'
         },
       ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'mac',
     },
+    # END obsolete Mac bots -- remove after waterfall restarted successfully.
     'Linux Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
           'os': 'Ubuntu'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'linux',
@@ skipping 193 matching lines @@
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Debug_x64',
       'swarming': True,
       'os_type': 'win',
     },
+    # BEGIN obsolete Mac bots -- remove after waterfall restarted successfully.
     'Mac 10.10 Release (Intel)': {
       'swarming_dimensions': [
         {
           'gpu': '8086:0a2e',
           'os': 'Mac-10.12'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
@@ skipping 89 matching lines @@
           'gpu': '1002:6821',
           'hidpi': '1',
           'os': 'Mac'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off for testing purposes.
       'swarming': False,
       'os_type': 'mac',
     },
+    # END obsolete Mac bots -- remove after waterfall restarted successfully.
+    'Mac Release (Intel)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.12'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Debug (Intel)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.12'
+        },
+      ],
+      'build_config': 'Debug',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Pro Release (AMD)': {
+      '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 Pro Debug (AMD)': {
+      '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 (NVIDIA)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:0fe9',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Retina Debug (NVIDIA)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:0fe9',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Debug',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Retina Release (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Retina Debug (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Debug',
+      'swarming': True,
+      'os_type': 'mac',
+    },
+    'Mac Experimental Retina Release (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Release',
+      # This bot is a one-off for testing purposes.
+      'swarming': False,
+      'os_type': 'mac',
+    },
     'Mac Experimental Retina Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:0fe9',
           'hidpi': '1',
           'os': 'Mac'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off for testing purposes.
@@ skipping 228 matching lines @@
         {
           'gpu': '1002:6613',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
       'type': Types.OPTIONAL,
     },
+    'Optional Mac Release (Intel)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.12'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+      'type': Types.OPTIONAL,
+    },
+    'Optional Mac Retina Release (NVIDIA)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:0fe9',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+      'type': Types.OPTIONAL,
+    },
+    'Optional Mac Retina Release (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+      'type': Types.OPTIONAL,
+    },
+    # BEGIN obsolete Mac bots -- remove after waterfall restarted successfully.
     'Optional Mac 10.10 Release (Intel)': {
       'swarming_dimensions': [
         {
           'gpu': '8086:0a2e',
           'os': 'Mac-10.12'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
@@ skipping 18 matching lines @@
           'gpu': '1002:6821',
           'hidpi': '1',
           'os': 'Mac'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
       'type': Types.OPTIONAL,
     },
+    # END obsolete Mac bots -- remove after waterfall restarted successfully.
     'Optional Linux Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
           'os': 'Ubuntu'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'linux',
@@ skipping 1118 matching lines @@
   install_parent_links(WATERFALL)
   install_parent_links(V8_FYI_WATERFALL)
 
   generate_all_tests(FYI_WATERFALL, 'chromium.gpu.fyi.json')
   generate_all_tests(WATERFALL, 'chromium.gpu.json')
   generate_all_tests(V8_FYI_WATERFALL, 'client.v8.fyi.json')
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())