Switched remaining GPU test bots to be pure testers, triggered by builders.

masters/master.chromium.gpu/master.cfg

 # 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.
 # vim: set ft=python:
 
 from buildbot.changes import svnpoller
 from buildbot.scheduler import Dependent
-from buildbot.scheduler import Scheduler
-from buildbot.scheduler import Triggerable
 
 from common import chromium_utils
 
 from master import build_utils
 from master import master_config
 from master import master_utils
+from master import recipe_master_helper
 from master import slaves_list
 from master.factory import annotator_factory
 from master.factory import chromium_factory
 
 import collections
 import config
 import master_site_config
 
 ActiveMaster = master_site_config.ChromiumGPU
 
@@ skipping 38 matching lines @@
 # Load the slave list. We need some information from it in order to
 # produce the builders.
 slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumGPU')
 
 ####### SCHEDULERS
 
 ## configure the Schedulers
 
 # Main scheduler for all changes in trunk.
 
-polling_builders = []
-# Maps the parent builder to a set of the names of the builders it triggers.
-trigger_map = collections.defaultdict(list)
-# Maps the name of the parent builder to the (synthesized) name of its
-# trigger, wrapped in a list.
-trigger_name_map = {}
-next_group_id = 0
-for slave in slaves.slaves:
-  builder = slave['builder']
-  parent_builder = slave.get('triggered_by')
-  if parent_builder is not None:
-    trigger_map[parent_builder].append(builder)
-    if parent_builder not in trigger_name_map:
-      trigger_name_map[parent_builder] = 'trigger_group_%d' % next_group_id
-      next_group_id += 1
-  else:
-    polling_builders.append(builder)
-s_gpu = Scheduler(name='gpu',
-                  branch='src',
-                  treeStableTimer=60,
-                  builderNames=polling_builders)
-c['schedulers'] = [s_gpu]
-for name, builders in trigger_map.iteritems():
-  c['schedulers'].append(Triggerable(name=trigger_name_map[name],
-                                     builderNames=builders))
+trigger_name_map = recipe_master_helper.AddSchedulersAndTriggers(
+  buildmaster_config=c, slave_list=slaves, scheduler_name='gpu', branch='src')
 
 ####### BUILDERS
 
 builders = []
 
 # ----------------------------------------------------------------------------
 # FACTORIES
 
 m_annotator = annotator_factory.AnnotatorFactory()
 m_android = chromium_factory.ChromiumFactory(
     'src/build', 'linux2', nohooks_on_update=True, target_os='android')
 
 # Some shortcut to simplify the code below.
 F_ANDROID = m_android.ChromiumAnnotationFactory
 
 # TODO(kbr): switch the Android builder to use recipes too.
-desktop_builders = []
-for slave in slaves.slaves:
-  if 'recipe' in slave:
-    factory_properties = {
-      'test_results_server': 'test-results.appspot.com',
-      'generate_gtest_json': True,
-      'build_config': slave['build_config']
-    }
-    if 'perf_id' in slave:
-      factory_properties['show_perf_results'] = True
-      factory_properties['perf_id'] = slave['perf_id']
-    name = slave['builder']
-    desktop_builders.append({
-      'name': name,
-      'factory': m_annotator.BaseFactory(
-        slave['recipe'],
-        factory_properties,
-        [trigger_name_map[name]] if name in trigger_name_map else None)
-    })
+recipe_master_helper.AddRecipeBasedBuilders(
+  c, slaves, m_annotator, trigger_name_map)
 
 f_android_nexus7_dbg = F_ANDROID(
     target='Debug',
     slave_type='AnnotatedBuilder',
     annotation_script='src/build/android/buildbot/bb_run_bot.py',
     factory_properties={
       'android_bot_id': 'gpu-builder-tests-dbg',
       'gclient_timeout': 3600
     })
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
 b_android_nexus7 = {'name': 'Android Debug (Nexus 7)',
                     'factory': f_android_nexus7_dbg}
 
-c['builders'] = desktop_builders + [ b_android_nexus7 ]
+c['builders'] += [ b_android_nexus7 ]
 
 # Associate the slaves to the manual builders. The configuration is in
 # slaves.cfg.
 for builder in c['builders']:
   builder['slavenames'] = slaves.GetSlavesName(builder=builder['name'])
 
 ####### BUILDSLAVES
 
 # The 'slaves' list defines the set of allowable buildslaves. List all the
 # slaves registered to a builder. Remove dupes.
 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'],
                                            config.Master.GetBotPassword())
 
 # Make sure everything works together.
 master_utils.VerifySetup(c, slaves)
 
 ####### STATUS TARGETS
 
 # Adds common status and tools to this master.
 master_utils.AutoSetupMaster(c, ActiveMaster,
     public_html='../master.chromium/public_html',
     templates=['../master.chromium/templates'],
     enable_http_status_push=ActiveMaster.is_production_host)
 
 ####### PROJECT IDENTITY
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.gpu/'