Add decorations to bot names for modifying parts of try sets.

scripts/master/try_job_base.py

 # Copyright (c) 2011 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.
 
 import re
 
 import buildbot
 from buildbot.process.properties import Properties
 
 from twisted.python import log
@@ skipping 54 matching lines @@
     options.setdefault('project', self.pools.default_pool_name)
     options.setdefault('repository', None)
     # Code review infos. Enforce numbers.
     def try_int(key):
       if options.setdefault(key, None) is None:
         return
       options[key] = int(options[key])
     try_int('patchset')
     try_int('issue')
 
-    builder_names = []
+    build_names = []
     if 'bot' in options:
-      builder_names = options.get('bot', '').split(',')
-    options['bot'] = self.pools.Select(builder_names, options['project'])
+      build_names = options.get('bot', '').split(',')
+    options['bot'] = self.pools.Select(build_names, options['project'])
+    bot_names = [b.split(':')[0] for b in options['bot']]
     log.msg(
-        'Choose %s for job %s' % (','.join(options['bot']), options['reason']))
+        'Chose %s for job %s' % (','.join(bot_names), options['reason']))

[Peter Mayo, 2011/12/07 16:38:00]

Only the tense change is necessary.

[Peter Mayo, 2011/12/09 21:29:08]

Done.

     return options
 
   def get_props(self, options):
     """Current job extra properties that are not related to the source stamp.
     Initialize with the Scheduler's base properties.
     """
-    keys = ('clobber', 'issue', 'patchset', 'rietveld', 'testfilter')
+    keys = ('clobber', 'issue', 'patchset', 'rietveld', 'testfilter', 'builds')

[Peter Mayo, 2011/12/07 16:38:00]

This can go away now.

[Peter Mayo, 2011/12/09 21:29:08]

Done.

     # All these settings have no meaning when False or not set, so don't set
     # them in that case.
     properties = dict((i, options[i]) for i in keys if options.get(i))
     props = Properties()
     props.updateFromProperties(self.properties)
     props.update(properties, 'Try job')
     return props