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

masters/master.chromium.gpu.fyi/master.cfg

Index: masters/master.chromium.gpu.fyi/master.cfg
diff --git a/masters/master.chromium.gpu.fyi/master.cfg b/masters/master.chromium.gpu.fyi/master.cfg
index 57454e70f68bdc1d46574ef9099f99eec4019d6f..5a6ec4528d01633532fc87375865dec4ae358555 100644
--- a/masters/master.chromium.gpu.fyi/master.cfg
+++ b/masters/master.chromium.gpu.fyi/master.cfg
@@ -4,13 +4,13 @@
 
 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
@@ -69,12 +69,8 @@ slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumGPUFYI')
 
 # 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
 
@@ -125,23 +121,8 @@ f_linux_audio_rel = F_LINUX_AUDIO(
 # ----------------------------------------------------------------------------
 # 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}
@@ -150,7 +131,7 @@ 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.