Reorganized optional builders on mac tryserver

masters/master.tryserver.chromium.mac/slaves.cfg

Index: masters/master.tryserver.chromium.mac/slaves.cfg
diff --git a/masters/master.tryserver.chromium.mac/slaves.cfg b/masters/master.tryserver.chromium.mac/slaves.cfg
index f047d04e867accfe81dbca593ad9c3c98d3d0c9e..9227ec0134e2f7de2846eb32389b4b0bb68b0cd0 100644
--- a/masters/master.tryserver.chromium.mac/slaves.cfg
+++ b/masters/master.tryserver.chromium.mac/slaves.cfg
@@ -33,26 +33,29 @@ def mac():
       'mac_nacl_sdk_build',
   ]
 
-  optional2_slaves = ['vm%d-m4' % i for i in [1025, 1026]]
+  optional2_slaves = ['vm1025-m4']
   optional2_builders = [
-      'mac_chromium_archive_rel_ng',
-      'mac_chromium_asan_rel_ng',
       'mac_chromium_compile_rel_ng',
-      'mac_deterministic',
-      'mac_chromium_asan_variable',
       'mac_chromium_variable',
       'mac_chromium_variable_archive',
-      'mac_chromium_variable_chrome',
-      'mac_chromium_variable_gn',
-      'mac_chromium_variable_layout',
   ]
 
+  optional3_slaves = ['build190-m4']
   optional3_builders =  [
       'mac_chromium_variable_10.10',
       'mac_chromium_variable_10.10_layout',
   ]
 
-  optional3_slaves = ['build%d-m4' % i for i in [190]]
+  optional4_slaves = ['vm1026-m4']
+  optional4_builders = [
+      'mac_chromium_archive_rel_ng',
+      'mac_chromium_asan_rel_ng',
+      'mac_deterministic',
+      'mac_chromium_asan_variable',
+      'mac_chromium_variable_chrome',
+      'mac_chromium_variable_gn',
+      'mac_chromium_variable_layout',
+  ]
 
   out = []
   out.extend(
@@ -123,6 +126,17 @@ def mac():
       'pool': 'mac_optional_10_10',
     } for slave in optional3_slaves
   )
+  out.extend(
+    {
+      'master': 'TryServerChromiumMac',
+      'builder': optional4_builders,
+      'hostname': slave,
+      'os': 'mac',
+      'version': '10.10',

[dnj, 2016/03/31 22:54:35]

This should have the same parameters as the "optional2_builders" pool (e.g.,
10.9).

Also, the pool name probably should be something unique? That's what I'm seeing
elsewhere.

+      'bits': '64',
+      'pool': 'mac_optional_10_10',
+    } for slave in optional4_slaves
+  )
 
   return out