Reorganized optional builders on mac tryserver

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

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright 2014 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.
 
 # See master.experimental/slaves.cfg for documentation.
 
 def mac():
   cq_slaves = (
@@ skipping 15 matching lines @@
       'mac_chromium_clang_upload',
       'mac_optional_gpu_tests_rel',
   ]
 
   optional1_slaves = ['vm723-m4']
   optional1_builders = [
       'mac_nacl_sdk',
       'mac_nacl_sdk_build',
   ]
 
-  optional2_slaves = ['vm%d-m4' % i for i in [1025, 1026]]
+  optional2_slaves = ['vm1025-m4']
   optional2_builders = [
+      'mac_chromium_compile_rel_ng',
+      'mac_chromium_variable',
+      'mac_chromium_variable_archive',
+  ]
+
+  optional3_slaves = ['build190-m4']
+  optional3_builders =  [
+      'mac_chromium_variable_10.10',
+      'mac_chromium_variable_10.10_layout',
+  ]
+
+  optional4_slaves = ['vm1026-m4']
+  optional4_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_builders =  [
-      'mac_chromium_variable_10.10',
-      'mac_chromium_variable_10.10_layout',
-  ]
-
-  optional3_slaves = ['build%d-m4' % i for i in [190]]
-
   out = []
   out.extend(
     {
       'master': 'TryServerChromiumMac',
       'builder': cq_builders,
       'preferred_builder': cq_builders[i % len(cq_builders)],
       'hostname': slave,
       'os': 'mac',
       'version': '10.9',
       'bits': '64',
@@ skipping 49 matching lines @@
     {
       'master': 'TryServerChromiumMac',
       'builder': optional3_builders,
       'hostname': slave,
       'os': 'mac',
       'version': '10.10',
       'bits': '64',
       '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
 
 
 def ios():
   # Split by dbg/rel because it splits the load evenly.
   cq_builders_dbg = [
     'ios_dbg_simulator',
     'ios_dbg_simulator_gn',
     'ios_dbg_simulator_ninja',
@@ skipping 40 matching lines @@
       'pool': 'ios_cq_rel',
     } for slave in cq_slaves_rel]
 
   # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on
   # the bots.
 
   return compile_slaves_dbg + compile_slaves_rel
 
 
 slaves = mac() + ios()