Add split builder/tester android trybot target

masters/master.tryserver.chromium/slaves.cfg

Index: masters/master.tryserver.chromium/slaves.cfg
diff --git a/masters/master.tryserver.chromium/slaves.cfg b/masters/master.tryserver.chromium/slaves.cfg
index c92ecff8c9e34eff35d0114d72d33dc367377682..9b04ab9534a388708c9c9f9d67999bf5d8c47e1d 100644
--- a/masters/master.tryserver.chromium/slaves.cfg
+++ b/masters/master.tryserver.chromium/slaves.cfg
@@ -154,14 +154,7 @@ def cros():
 
 
 def android():
-  """Android compile-only trybots."""
-  normal_slaves = [46, 57, 176, 98]
-  # Newer slaves.
-  # Full range of allocated bots...
-    # normal_slaves += range(430, 468)
-  # But these are the ones we've set up so far.
-  normal_slaves += [430, 434, 436, 437, 438, 439, 442, 443, 444, 445]
-  return [
+  compile_only_slaves = [
     {
       'master': 'TryServer',
       'builder': ['android'],

[M-A Ruel, 2012/07/14 22:32:50]

You should set it to:
'builder': ['android', 'android_compiler'],

There is no need to split them.

[Isaac (away), 2012/07/16 10:00:10]

Can you explain what that does?  I've never tried to allocate machines for
double duty

[M-A Ruel, 2012/07/16 13:11:44]

Look at the other configs. The result is the slave is connected to multiple
builders so whichever first builder to request the slave gets it for the
duration of the build, since we limit to one concurrent build per slave. The
main limiting factor in our case is the disk space usage so we try to limit it
to ~5 checkouts, e.g. 5 builders per slave.

@@ -169,16 +162,25 @@ def android():
       'os': 'linux',
       'version': 'lucid',
       'bits': '64',
-    } for i in normal_slaves
+    } for i in range(430, 446)
   ]
 
+  compiler_zip_slaves = [
+    {
+      'master': 'TryServer',
+      'builder': ['android_compiler'],
+      'hostname': 'vm%d-m4' % i,
+      'os': 'linux',
+      'version': 'lucid',
+      'bits': '64',
+    } for i in range(446, 468)
+  ]
 
-def android_test():
-  """Android compile-and-test trybots."""
-  return [
+  # Android tester bots
+  tester_slaves = [
     {
       'master': 'TryServer',
-      'builder': ['android_test'],
+      'builder': ['android_tester'],
       'hostname': 'chromeperf%d' % i,
       'os': 'linux',
       'version': 'lucid',
@@ -186,6 +188,7 @@ def android_test():
     } for i in (23, 26, 27, 28, 29)
   ]
 
+  return compile_only_slaves + compiler_zip_slaves + tester_slaves
 
 def windows():
   # One of these builders set is seletected in alternance as an extra builder.
@@ -251,4 +254,4 @@ def windows():
       gpu_slaves)
 
 
-slaves = linux() + mac() + windows() + cros() + android() + android_test()
+slaves = linux() + mac() + windows() + cros() + android()