Move CrWinClang and Tester to recipes.

masters/master.chromium.fyi/master.cfg

 # vim: ft=python:
 # 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.filter import ChangeFilter
 from buildbot.scheduler import Dependent
 from buildbot.scheduler import Nightly
 from buildbot.scheduler import Periodic
 from buildbot.scheduler import Scheduler
@@ skipping 305 matching lines @@
 chromium_windows_drmemory_archive = master_config.GetGSUtilUrl(
     'chromium-build-transfer', 'Windows FYI Builder (DrMemory)')
 
 chromium_linux_arm_archive = master_config.GetGSUtilUrl(
     'chromium-build-cache',
     '%s/Linux ARM Cross-Compile' % ActiveMaster.project_name)
 
 chromium_android_fyi_dbg_archive = master_config.GetGSUtilUrl(
     'chromium-android', 'android_fyi_dbg')
 
-chromium_win_clang_archive = master_config.GetGSUtilUrl(
-    'chromium-build-transfer', 'CrWinClang')
 chromium_win_clang_dbg_archive = master_config.GetGSUtilUrl(
     'chromium-build-transfer', 'CrWinClang(dbg)')
 chromium_win_clang_shared_archive = master_config.GetGSUtilUrl(
     'chromium-build-transfer', 'CrWinClang(shared)')
 chromium_win_clang_64_archive = master_config.GetGSUtilUrl(
     'chromium-build-transfer', 'CrWinClang64')
 chromium_win_clang_64_dbg_archive = master_config.GetGSUtilUrl(
     'chromium-build-transfer', 'CrWinClang64(dbg)')
 chromium_win_clang_64_shared_archive = master_config.GetGSUtilUrl(
     'chromium-build-transfer', 'CrWinClang64(dll)')
@@ skipping 422 matching lines @@
     target='Release_x64',
     tests=win_x64_tests,
     options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'target_arch=x64',
     }})
 
 win_clang_tests = tests_win_1 + tests_win_2 + ['content_unittests']
 
-f_chromium_win_clang = win_out().ChromiumFactory(
-    slave_type='Builder',
-    target='Release',
-    factory_properties={
-      'build_url': chromium_win_clang_archive,
-      'trigger': 'cr_win_clang',
-      'gclient_env': {
-        'GYP_DEFINES': 'clang=1',
-    }})
-f_chromium_win_clang_tester = win_out().ChromiumFactory(
-    build_url=chromium_win_clang_archive,
-    slave_type='Tester',
-    target='Release',
-    tests=win_clang_tests)
-
 f_chromium_win_clang_dbg = win_out().ChromiumFactory(
     slave_type='Builder',
     target='Debug',
     factory_properties={
       'trigger': 'cr_win_clang_dbg',
       'build_url': chromium_win_clang_dbg_archive,
       'gclient_env': {
         'GYP_DEFINES': 'clang=1',
     }})
 f_chromium_win_clang_dbg_tester = win_out().ChromiumFactory(
@@ skipping 590 matching lines @@
 
 b_chromium_win_x64 = {
   'name': 'Chromium Win x64 Clobber',
   'factory': f_chromium_win_x64,
   'category': 'windows',
   'auto_reboot': False,
 }
 
 b_chromium_win_clang = {
   'name': 'CrWinClang',
-  'factory': f_chromium_win_clang,
+  'factory': m_annotator.BaseFactory('chromium', triggers=['cr_win_clang']),
   'category': 'win clang',
   'auto_reboot': False,
 }
 b_chromium_win_clang_tester = {
   'name': 'CrWinClang tester',
-  'factory': f_chromium_win_clang_tester,
+  'factory': m_annotator.BaseFactory('chromium'),
   'category': 'win clang',
   'auto_reboot': False,
 }
 
 b_chromium_win_clang_dbg = {
   'name': 'CrWinClang(dbg)',
   'factory': f_chromium_win_clang_dbg,
   'category': 'win clang',
   'auto_reboot': False,
 }
@@ skipping 837 matching lines @@
       fromaddr=ActiveMaster.from_address,  # Reply-To address
       mode='failing',
       relayhost=config.Master.smtp,
       subject='Build failure on %(builder)s',
       extraRecipients=[
         'sebmarchand+pgofailure@google.com',
         'scottmg+pgofailure@google.com'
       ],
       sendToInterestedUsers=False,
       builders=['Chromium Win PGO Builder']))