Reshuffle ios slave machines

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 cd02de874a0ea369964f960d4e038df196c667b1..f706267ea573ed9078144205eb1036b2eef72365 100644
--- a/masters/master.tryserver.chromium.mac/slaves.cfg
+++ b/masters/master.tryserver.chromium.mac/slaves.cfg
@@ -89,38 +89,58 @@ def mac():
 
 
 def ios():
-  cq_builders = [
+  # Split by dbg/rel because it splits the load evenly.
+  cq_builders_dbg = [
     'ios_dbg_simulator',
     'ios_dbg_simulator_gn',
     'ios_dbg_simulator_ninja',
+  ]
+  cq_builders_rel = [
     'ios_rel_device',
     'ios_rel_device_gn',
     'ios_rel_device_ninja',
   ]
 
   # Skip 82. http://crbug.com/395099.
-  cq_slaves = ['build%d-a4' % i for i in range(79, 82) + range(83, 99)] + [
-      'build%d-m4' % i for i in [21, 73]]
-  cq_slaves.extend(['vm%s-m4' % i for i in xrange(190, 191)])
-  cq_slaves.extend(['vm%s-m4' % i for i in xrange(671, 678)])
-  cq_slaves.extend(['vm%i-m4' % i for i in xrange(898, 902)])
-  cq_slaves.extend(['vm%i-m4' % i for i in xrange(1069, 1081)])
-
-  compile_slaves = [
+  # 9 + 1 builders for dbg

[Sergey Berezin, 2016/02/25 19:17:38]

Please check these numbers against the Capacity console, if you haven't done so
yet (go/chrome-infra-graphs > Buildbot > Capacity). I *think* the load should be
roughly even, given the CQ config, but it's worth looking at the actual load.

CQ config: 
https://chromium.googlesource.com/chromium/src/+/master/infra/config/cq.cfg#67

[pgervais, 2016/02/25 19:49:09]

Without looking I think it's unnecessary because a lot of those machines are
already permanently offline (9 to be precise), which means that we are already
running all the builders on 2/3 of the machines.

After looking, it appears that most of the load is caused by
ios_dbg_simulator_ninja and ios_rel_device_ninja (max number of builds is around
10). Those builders are in different pools after this CL, and each pool has 22
and 23 builders respectively. So I think we're good.

+  cq_slaves_dbg = (['build%d-a4' % i for i in range(79, 82) + range(83, 89)] +
+                   ['build21-m4'])
+  # 10 + 1 builders for rel
+  cq_slaves_rel = (['build%d-a4' % i for i in range(89, 99)] +
+                   ['build73-m4'])
+
+  # 12 slaves each
+  cq_slaves_dbg.extend(['vm%s-m4' % i for i in xrange(190, 191)])
+  cq_slaves_dbg.extend(['vm%s-m4' % i for i in xrange(671, 678)])
+  cq_slaves_dbg.extend(['vm%i-m4' % i for i in xrange(898, 902)])
+  cq_slaves_rel.extend(['vm%i-m4' % i for i in xrange(1069, 1081)])
+
+  compile_slaves_dbg = [
     {
       'master': 'TryServerChromiumMac',
-      'builder': cq_builders,
+      'builder': cq_builders_dbg,
       'hostname': slave,
-      'preferred_builder': cq_builders[i % len(cq_builders)],
+      'preferred_builder': cq_builders_dbg[i % len(cq_builders_dbg)],
+      'os': 'mac',
+      'version': '10.10',
+      'pool': 'ios_cq',

[Sergey Berezin, 2016/02/25 19:17:38]

s/ios_cq/ios_cq_dbg/

[pgervais, 2016/02/25 19:49:09]

Done.

+    } for slave in cq_slaves_dbg]
+
+  compile_slaves_rel = [
+    {
+      'master': 'TryServerChromiumMac',
+      'builder': cq_builders_rel,
+      'hostname': slave,
+      'preferred_builder': cq_builders_rel[i % len(cq_builders_rel)],
       'os': 'mac',
       'version': '10.10',
       'pool': 'ios_cq',

[Sergey Berezin, 2016/02/25 19:17:38]

s/ios_cq/ios_cq_rel/

[pgervais, 2016/02/25 19:49:09]

Done.

-    } for slave in cq_slaves]
+    } for slave in cq_slaves_rel]
 
   # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on
   # the bots.
 
-  return compile_slaves
+  return compile_slaves_dbg + compile_slaves_rel
 
 
 slaves = mac() + ios()