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

masters/master.chromium.gpu/master.cfg

Index: masters/master.chromium.gpu/master.cfg
diff --git a/masters/master.chromium.gpu/master.cfg b/masters/master.chromium.gpu/master.cfg
index f12d60d879e82832765f99c8ffe91a9bf67add78..75e8286a739abdcdebd46c6297d910b28b151d15 100644
--- a/masters/master.chromium.gpu/master.cfg
+++ b/masters/master.chromium.gpu/master.cfg
@@ -5,14 +5,13 @@
 
 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
@@ -71,31 +70,8 @@ slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumGPU')
 
 # 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
 
@@ -112,25 +88,8 @@ m_android = chromium_factory.ChromiumFactory(
 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',
@@ -147,7 +106,7 @@ f_android_nexus7_dbg = F_ANDROID(
 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.