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

masters/master.chromium.gpu.fyi/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.
 
 from buildbot.changes import svnpoller
 from buildbot.scheduler import Dependent
-from buildbot.scheduler import Scheduler
 
 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 config
 import master_site_config
 
 ActiveMaster = master_site_config.ChromiumGPUFYI
 
 # This is the dictionary that the buildmaster pays attention to. We also use
@@ skipping 38 matching lines @@
 # produce the builders.
 slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumGPUFYI')
 
 
 ####### SCHEDULERS
 
 ## configure the Schedulers
 
 # Main scheduler for all changes in trunk.
 
-builderNames = sorted(slave['builder'] for slave in slaves.slaves)
-s_gpu = Scheduler(name='gpu',
-                  branch='src',
-                  treeStableTimer=60,
-                  builderNames=builderNames)
-c['schedulers'] = [s_gpu]
+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()
 
@@ skipping 30 matching lines @@
       'content_unittests',
       'media',
     ],
     factory_properties={'test_results_server': 'test-results.appspot.com',
                         'generate_gtest_json': True})
 
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
-gpu_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']
-    gpu_builders.append({
-      'name': slave['builder'],
-      'factory': m_annotator.BaseFactory(
-        slave['recipe'],
-        factory_properties)
-    })
+recipe_master_helper.AddRecipeBasedBuilders(
+  c, slaves, m_annotator, trigger_name_map)
 
 b_win_audio = {'name': 'Win7 Audio',
                'factory': f_win_audio_rel}
 
 b_linux_audio = {'name': 'Linux Audio',
                  'factory': f_linux_audio_rel}
 
 # Order them by OS type, target type, and OS version.
-c['builders'] = gpu_builders + [ b_win_audio, b_linux_audio ]
+c['builders'] += [ b_win_audio, b_linux_audio ]
 
 # 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.fyi/'