Converted the remaining GPU bots to recipes.

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 master import build_utils
 from master import master_config
 from master import master_utils
 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
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
@@ skipping 22 matching lines @@
 # Polls config.Master.trunk_url for changes
 chromium_rev = 'http://src.chromium.org/viewvc/chrome?view=rev&revision=%s'
 trunk_poller = svnpoller.SVNPoller(svnurl=config.Master.trunk_url,
                                    split_file=ChromeTreeFileSplitter,
                                    pollinterval=10,
                                    revlinktmpl=chromium_rev)
 
 c['change_source'] = [trunk_poller]
 
 
+####### SLAVES
+
+# Load the slave list. We need some information from it in order to
+# produce the builders.
+slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumGPUFYI')
+
+
 ####### SCHEDULERS
 
 ## configure the Schedulers
 
 # Main scheduler for all changes in trunk.
 
 s_gpu = Scheduler(name='gpu',
                   branch='src',
                   treeStableTimer=60,
                   builderNames=['WinXP Release (NVIDIA)',
                                 'WinXP Debug (NVIDIA)',
                                 'Linux Release (Intel)',
                                 'Linux Release (ATI)',
                                 'Win7 Audio',
                                 'Linux Audio',])
 c['schedulers'] = [s_gpu]
 
 ####### BUILDERS
 
 builders = []
 
 # ----------------------------------------------------------------------------
 # FACTORIES
 
+m_annotator = annotator_factory.AnnotatorFactory()
+
+# TODO(kbr): rtoy: switch the Audio bots to use recipes too.

[agable, 2013/09/27 19:57:26]

rtoy?

[Ken Russell (switch to Gerrit), 2013/09/27 20:30:07]

rtoy@ to be more precise.

+
 # Using src/webkit is necessary for running the layout tests on Windows.
 # However, the 'all' project resides in src/build. Thus, build in one place and
 # test in another. Thus, it is impossible to build and test on the same Windows
 # bot.
 m_win = chromium_factory.ChromiumFactory('src/build', 'win32')
 m_linux = chromium_factory.ChromiumFactory('src/out', 'linux2')
 
 # Some shortcut to simplify the code below.
-F_WIN = m_win.ChromiumGPUFactory
 F_WIN_AUDIO = m_win.ChromiumFactory
-F_LINUX = m_linux.ChromiumGPUFactory
 F_LINUX_AUDIO = m_linux.ChromiumFactory
 
-full_test_suite = [
-  'content_gl_tests',
-  'gles2_conform_test',
-  'gl_tests',
-  'gpu_content_tests',
-  'gpu_frame_rate',
-  'gpu_throughput',
-  'tab_capture_performance',
-]
-
-debug_test_suite = [
-  'content_gl_tests',
-  'gles2_conform_test',
-  'gl_tests',
-  'gpu_content_tests',
-]
-
-f_winxp_rel = F_WIN(
-    project='all.sln;chromium_gpu_builder',
-    target='Release',
-    slave_type='BuilderTester',
-    tests=full_test_suite,
-    factory_properties={
-      'gclient_env': {
-        'GYP_DEFINES': 'fastbuild=1 internal_gles2_conform_tests=1',
-      },
-      'perf_id': 'gpu-fyi-winxp-release-nvidia',
-      'show_perf_results': True,
-      'test_results_server': 'test-results.appspot.com',
-      'generate_gtest_json': True,
-    })
-
-f_winxp_dbg = F_WIN(
-    project='all.sln;chromium_gpu_debug_builder',
-    target='Debug',
-    slave_type='BuilderTester',
-    tests=debug_test_suite,
-    factory_properties={
-      'gclient_env': {
-        'GYP_DEFINES': 'fastbuild=1 internal_gles2_conform_tests=1',
-      },
-      'perf_id': 'gpu-fyi-winxp-debug-nvidia',
-      'show_perf_results': True,
-      'test_results_server': 'test-results.appspot.com',
-      'generate_gtest_json': True,
-    })
-
-f_linux_intel_rel = F_LINUX(
-    target='Release',
-    slave_type='BuilderTester',
-    options=['chromium_gpu_builder'],
-    tests=full_test_suite,
-    factory_properties={
-      'perf_id': 'gpu-fyi-linux-release-intel',
-      'show_perf_results': True,
-      'test_results_server': 'test-results.appspot.com',
-      'generate_gtest_json': True,
-      'gclient_env': {
-        'GYP_DEFINES': 'internal_gles2_conform_tests=1',
-      },
-    })
-
-f_linux_ati_rel = F_LINUX(
-    target='Release',
-    slave_type='BuilderTester',
-    options=['chromium_gpu_builder'],
-    tests=full_test_suite,
-    factory_properties={
-      'perf_id': 'gpu-fyi-linux-release-ati',
-      'show_perf_results': True,
-      'test_results_server': 'test-results.appspot.com',
-      'generate_gtest_json': True,
-      'gclient_env': {
-        'GYP_DEFINES': 'internal_gles2_conform_tests=1',
-      },
-    })
-
 f_win_audio_rel = F_WIN_AUDIO(
     project='all.sln;chromium_builder_tests',
     target='Release',
     slave_type='BuilderTester',
     tests=[
       'content_unittests',
       'media',
     ],
     factory_properties={'gclient_env': {'GYP_DEFINES': 'fastbuild=1'},
                         'test_results_server': 'test-results.appspot.com',
                         'generate_gtest_json': True})
 
 f_linux_audio_rel = F_LINUX_AUDIO(
     target='Release',
     slave_type='BuilderTester',
     options=['content_unittests', 'media_unittests'],
     tests=[
       'content_unittests',
       'media',
     ],
     factory_properties={'test_results_server': 'test-results.appspot.com',
                         'generate_gtest_json': True})
 
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
-b_win_1 = {'name': 'WinXP Release (NVIDIA)',
-           'factory': f_winxp_rel}
-
-b_win_2 = {'name': 'WinXP Debug (NVIDIA)',
-           'factory': f_winxp_dbg}
-
-b_linux_1 = {'name': 'Linux Release (Intel)',
-             'factory': f_linux_intel_rel}
-
-b_linux_2 = {'name': 'Linux Release (ATI)',
-             'factory': f_linux_ati_rel}
+gpu_builders = []
+for slave in slaves.slaves:
+  if not slave.get('is_audio'):
+    factory_properties = {
+      'test_results_server': 'test-results.appspot.com',
+      'generate_gtest_json': True,
+      'build_config': 'Debug'
+    }
+    if 'perf_id' in slave:
+      factory_properties['show_perf_results'] = True
+      factory_properties['perf_id'] = slave['perf_id']
+      factory_properties['build_config'] = 'Release'
+    gpu_builders.append({
+      'name': slave['builder'],
+      'factory': m_annotator.BaseFactory('gpu', factory_properties)
+    })
 
 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'] = [
-  b_win_1,
-  b_win_2,
-  b_linux_1,
-  b_linux_2,
-  b_win_audio,
-  b_linux_audio,
-]
+c['builders'] = gpu_builders + [ b_win_audio, b_linux_audio ]
 
 # Associate the slaves to the manual builders. The configuration is in
 # slaves.cfg.
-slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumGPUFYI')
 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/'