Add split builder/tester android trybot target

masters/master.tryserver.chromium/slaves.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 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 linux():
@@ skipping 136 matching lines @@
       'builder': ['cros_x86', 'cros_amd64'],
       'hostname': 'build%d-m4' % i,
       'os': 'linux',
       'version': 'lucid',
       'bits': '64',
     } for i in (2, 4, 5, 6)
   ]
 
 
 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.

       'hostname': 'vm%d-m4' % i,
       'os': 'linux',
       'version': 'lucid',
       'bits': '64',
-    } for i in normal_slaves
+    } for i in range(430, 446)
   ]
 
-
-def android_test():
-  """Android compile-and-test trybots."""
-  return [
+  compiler_zip_slaves = [
     {
       'master': 'TryServer',
-      'builder': ['android_test'],
+      'builder': ['android_compiler'],
+      'hostname': 'vm%d-m4' % i,
+      'os': 'linux',
+      'version': 'lucid',
+      'bits': '64',
+    } for i in range(446, 468)
+  ]
+
+  # Android tester bots
+  tester_slaves = [
+    {
+      'master': 'TryServer',
+      'builder': ['android_tester'],
       'hostname': 'chromeperf%d' % i,
       'os': 'linux',
       'version': 'lucid',
       'bits': '64',
     } 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.
   extras = [
       ['win_vs2010', 'win_vs2010_rel'],
       ['win_ash'],
       ['win_aura'],
       ['win_nacl_sdk'],
       ['win_layout', 'win_layout_rel']
   ]
@@ skipping 45 matching lines @@
     } for i in range(3, 6)
   ]
 
   return (
       normal_slaves +
       drmemory_slaves +
       chromeframe_slave +
       gpu_slaves)
 
 
-slaves = linux() + mac() + windows() + cros() + android() + android_test()
+slaves = linux() + mac() + windows() + cros() + android()