//testing/buildbot: Use mixins for chromium.mac

This CL enforces swarming dimensions for the mac testers on
chromium.mac using swarming_mixins.

Bug: 880973
Change-Id: I3982de0c6704ceaa2f8e3ab5b9909c5c01319aa6
Reviewed-on: https://chromium-review.googlesource.com/1223027
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592646}

testing/buildbot/generate_buildbot_json.py

@@ -409,7 +409,7 @@ class BBJSONGenerator(object):
     if 'hard_timeout' in swarming_dict:
       if swarming_dict['hard_timeout'] == 0: # pragma: no cover
         del swarming_dict['hard_timeout'] # pragma: no cover
-    if not swarming_dict['can_use_on_swarming_builders']:
+    if not swarming_dict.get('can_use_on_swarming_builders', False):
       # Remove all other keys.
       for k in swarming_dict.keys(): # pragma: no cover
         if k != 'can_use_on_swarming_builders': # pragma: no cover

testing/buildbot/swarming_mixins.pyl

@@ -25,4 +25,30 @@
       'os': 'Ubuntu-14.04',
     }
   },
+  'mac_10.10': {
+    'dimensions': {
+      'os': 'Mac-10.10',
+    }
+  },
+  'mac_10.11': {
+    'dimensions': {
+      'os': 'Mac-10.11',
+    }
+  },
+  'mac_10.13': {
+    'dimensions': {
+      'os': 'Mac-10.13',
+    }
+  },
+  'mac_mini_10.12': {
+    'dimensions': {
+      'gpu': '8086:0a2e',
+      'os': 'Mac-10.12.6',
+    }
+  },
+  'no_gpu': {
+    'dimensions': {
+      'gpu': 'none',
+    }
+  },
 }

testing/buildbot/waterfalls.pyl

@@ -3074,32 +3074,39 @@
         ]
       },
       'Mac10.10 Tests': {
+        'swarming_mixins': [
+            'mac_10.10',
+            'no_gpu',
+        ],
         'test_suites': {
           'gtest_tests': 'chromium_mac_gtests',
           'isolated_scripts': 'chromium_rel_isolated_scripts',
         },
       },
       'Mac10.11 Tests': {
+        'swarming_mixins': [
+            'mac_10.11',
+            'no_gpu',
+        ],
         'test_suites': {
           'gtest_tests': 'chromium_mac_gtests',
           'isolated_scripts': 'chromium_rel_isolated_scripts',
         },
       },
       'Mac10.12 Tests': {
-        'swarming': {
-          'dimension_sets': [
-            {
-              'gpu': '8086:0a2e',
-              'os': 'Mac-10.12.6',
-            },
-          ],
-        },
+        'swarming_mixins': [
+            'mac_mini_10.12',
+        ],
         'test_suites': {
           'gtest_tests': 'chromium_mac_gtests',
           'isolated_scripts': 'chromium_rel_isolated_scripts',
         },
       },
       'Mac10.13 Tests': {
+        'swarming_mixins': [
+            'mac_10.13',
+            'no_gpu',
+        ],
         'test_suites': {
           'gtest_tests': 'chromium_mac_gtests',
           'isolated_scripts': 'chromium_rel_isolated_scripts',
@@ -3107,6 +3114,10 @@
         },
       },
       'Mac10.13 Tests (dbg)': {
+        'swarming_mixins': [
+            'mac_10.13',
+            'no_gpu',
+        ],
         'test_suites': {
           'gtest_tests': 'chromium_mac_gtests',
           'isolated_scripts': 'chromium_dbg_isolated_scripts',