Remove non-recipe builders from tryserver.chromium that have recipe equivalents

masters/master.tryserver.chromium/master.cfg

 # -*- python -*-
 # ex: set syntax=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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import os
@@ skipping 381 matching lines @@
   'sync_integration_tests',
   'sync_unit_tests',
   'ui_unittests',
   'unit_tests',
   'url_unittests',
   'views_unittests',
   'webkit_compositor_bindings_unittests',
 ] + chromium_factory.blink_tests_for_chromium_tryjobs
 
 
-b_linux = CreateBuilder(
-    platform='linux',
-    target='Debug',
-    goma=True,
-    options=linux_targets,
-    tests=linux_tests,
-    builder_name='linux')
-
-pools['chrome'].append('linux')
-
-b_linux_rel = CreateBuilder(
-    platform='linux',
-    target='Release',
-    goma=True,
-    options=linux_targets,
-    tests=linux_tests + ['sizes_br'],
-    builder_name='linux_rel',
-    slavebuilddir='linux',
-    factory_properties={
-      'swarming_triggered_builder': 'linux_swarm_triggered',
-      'use_xvfb_on_linux': True,
-    },
-    run_default_swarm_tests=[
-      'base_unittests',
-      'browser_tests',
-      'interactive_ui_tests',
-      'net_unittests',
-      'unit_tests',
-    ])
-
 b_linux_rel_naclmore = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
     options=['all'],
     tests=['nacl_integration_br', 'buildrunner_tests'],
     builder_name='linux_rel_naclmore',
     slavebuilddir='linux',
     factory_properties={'use_xvfb_on_linux': True})
 
@@ skipping 54 matching lines @@
  'printing_br',
  'remoting_br',
  'sync_integration_br',
  'telemetry_perf_unittests_br',
  'telemetry_unittests_br',
  'unit_br',
  'url_unittests_br',
  'webkit_compositor_bindings_unittests_br',
 ] + chromium_factory.blink_tests_for_chromium_tryjobs
 
-b_mac = CreateBuilder(
-    platform='mac',
-    target='Debug',
-    options=mac_targets,
-    tests=mac_tests,
-    builder_name='mac',
-    goma=True,
-    clang=True)
-
-pools['chrome'].append('mac')
-
-b_mac_rel = CreateBuilder(
-    platform='mac',
-    target='Release',
-    options=mac_targets,
-    tests=mac_tests + ['sizes_br'],
-    builder_name='mac_rel',
-    slavebuilddir='mac',
-    goma=True,
-    clang=True,
-    factory_properties={
-      'swarming_triggered_builder': 'mac_swarm_triggered',
-    },
-    run_default_swarm_tests=[
-      'base_unittests',
-      'browser_tests',
-      'interactive_ui_tests',
-      'net_unittests',
-      'unit_tests',
-    ])
-
 b_mac_rel_naclmore = CreateBuilder(
     platform='mac',
     target='Release',
     options=['all'],
     tests=['nacl_integration_br', 'buildrunner_tests'],
     builder_name='mac_rel_naclmore',
     slavebuilddir='mac',
     goma=True,
     clang=True)
 
@@ skipping 64 matching lines @@
   'printing_br',
   'remoting_br',
   'sync_integration_br',
   'telemetry_perf_unittests_br',
   'telemetry_unittests_br',
   'unit_br',
   'url_unittests_br',
   'webkit_compositor_bindings_unittests_br',
 ] + chromium_factory.blink_tests_for_chromium_tryjobs
 
-b_win = CreateBuilder(
-    target='Debug',
-    platform='win32',
-    options=win_targets,
-    tests=win_tests,
-    builder_name='win',
-    factory_properties={
-      'gclient_env': {
-      },
-    },
-    goma=True)
-
-pools['chrome'].append('win')
-
-b_win_rel = CreateBuilder(
-    target='Release',
-    platform='win32',
-    options=win_targets,
-    tests=win_tests + ['sizes_br'],
-    builder_name='win_rel',
-    slavebuilddir='win',
-    factory_properties={
-      'gclient_env': {
-      },
-      'swarming_triggered_builder': 'win_swarm_triggered',
-    },
-    goma=True,
-    run_default_swarm_tests=[
-      'base_unittests',
-      'browser_tests',
-      'interactive_ui_tests',
-      'net_unittests',
-      'unit_tests',
-    ])
-
 b_win_rel_naclmore = CreateBuilder(
     target='Release',
     platform='win32',
     options=['all'],
     tests=win_tests,
     builder_name='win_rel_naclmore',
     slavebuilddir='win',
     goma=True,
     factory_properties={
       'gclient_env': {
       },
     })
 
 
 win_x64_options = [
   '--', 'all'
 ]
 
-b_win_x64_rel = CreateBuilder(
-    target='Release_x64',
-    platform='win32',
-    options=win_x64_options,
-    tests=win_tests,
-    builder_name='win_x64_rel',
-    slavebuilddir='win',
-    goma=True,
-    ninja=True,
-    factory_properties={
-      'gclient_env': {
-         'GYP_DEFINES': 'component=shared_library target_arch=x64',
-    }})
-
 # Tests that are single-machine shard-safe on Linux ChromeOS
 linux_chromeos_sharded = [
   'accessibility_unittests',
   'base_unittests',
   'browser_tests',
   'buildrunner_tests',
   'components_unittests',
   'content_browsertests',
   'content_unittests',
   'media_unittests',
@@ skipping 69 matching lines @@
 
 def tsan_tests(test_list):
   return prepend_type('tsan', test_list)
 
 browser_tests = [
   ('browser_tests_br', 'browser_tests'),
   ('content_browsertests_br', 'content_browsertests'),
   ('interactive_ui_tests_br', 'interactive_ui_tests'),
 ]
 
-# Chromium for ChromiumOS
-b_linux_chromeos = {
-  'name': 'linux_chromeos',
-  'factory': m_chromium_chromiumos.ChromiumOSFactory(
-      slave_type='Trybot',
-      target='Release',
-      tests=extract_tests(linux_chromeos_tests),
-      options=['--compiler=goma'] + extract_options(linux_chromeos_tests),
-      factory_properties={
-        'sharded_tests': sharded_tests,
-        'gclient_env': {
-          'GYP_DEFINES': ('chromeos=1 fastbuild=1'
-                          ' dcheck_always_on=1'
-                          ' ffmpeg_branding=ChromeOS'
-                          ' component=shared_library'
-                          ' proprietary_codecs=1')}})
-}
-
 b_android_aosp = {
   'name': 'android_aosp',
   'factory': m_annotator.BaseFactory('android_webview_aosp'),
 }
 
 b_blink_android_rel = CreateBuilder(
     platform='android',
     target='Release',
     builder_name='blink_android_compile_rel',
     slavebuilddir='blink_android',
@@ skipping 736 matching lines @@
           'browser_tests',
           'interactive_ui_tests',
           'net_unittests',
           'sync_integration_tests',
           'unit_tests',
         ]),
     'name': '%s_swarm_triggered' % name,
   } for name in ('linux', 'mac', 'win')
 ]
 
-
-# Clang builders
-b_linux_clang = CreateBuilder(
-    platform='linux',
-    target='Debug',
-    options=linux_targets,
-    tests=linux_tests,
-    builder_name='linux_clang',
-    goma=True,
-    clang=True,
-    # Keep all tests off by default.
-    factory_properties={
-      'non_default': linux_tests_full_name,
-      'gclient_env': {
-        'GYP_DEFINES': 'clang_use_chrome_plugins=1',
-      },
-    })
-
-b_linux_chromeos_clang = {
-  'name': 'linux_chromeos_clang',
-  'factory': m_chromium_chromiumos.ChromiumOSFactory(
-      slave_type='Trybot',
-      target='Debug',
-      options=['--build-tool=ninja', '--compiler=goma-clang'] +
-        extract_options(linux_chromeos_tests),
-      tests=[],
-      factory_properties={
-        # CreateBuilder() adds "fastbuild=1" for the other 2 clang bots.
-        'gclient_env': {
-          'GYP_GENERATORS': 'ninja',
-          'GYP_DEFINES': ('chromeos=1'
-                          ' clang=1 clang_use_chrome_plugins=1'
-                          ' fastbuild=1'
-                          ' ffmpeg_branding=ChromeOS proprietary_codecs=1'
-                          ' component=shared_library')}})
-}
-
 # this matches the bot on the main waterfall soon
 b_win8_aura = CreateBuilder(
     platform='win32',
     target='Release',
     builder_name='win8_aura',
     options=['aura_builder'],
     tests=[
       'ash_unittests_br',
       'aura_br',
       'buildrunner_tests',
@@ skipping 509 matching lines @@
     'slavebuilddir': (slavebuilddir or ('presubmit_%s' % name)),
     'factory': m_annotator.BaseFactory('run_presubmit', {'repo_name': name}),
   }
 
 b_blink_presubmit = presubmit('blink', slavebuilddir='linux')
 b_chromium_presubmit = presubmit('chromium', slavebuilddir='linux')
 b_tools_build_presubmit = presubmit('tools_build')
 
 
 c['builders'] = [
-  b_linux_rel, b_linux_rel_alt,
   b_linux_rel_precise32,
-  b_mac_rel, b_win_rel,
-  b_mac_x64_rel, b_win_x64_rel,
+  b_linux_rel_alt,
+  b_mac_x64_rel,
   b_linux_rel_naclmore, b_mac_rel_naclmore, b_win_rel_naclmore,
-  b_linux_clang,
-  b_linux, b_mac, b_win,
   b_android_dbg, b_android_dbg_triggered_tests,
   b_android_fyi_dbg, b_android_fyi_dbg_triggered_tests,
   b_android_x86_dbg,
   b_blink_android_dbg, b_blink_android_rel,
   b_android_clang_dbg, b_android_rel, b_android_rel_triggered_tests,
   b_android_aosp,
   b_ios_rel_device, b_ios_dbg_simulator, b_ios_rel_device_ninja,
-  b_linux_chromeos,
   b_valgrind_linux, b_valgrind_mac,
   b_linux_chromeos_valgrind,
   b_tsan_linux, b_tsan_win, b_drmemory_win,
   b_linux_layout,
   b_linux_layout_rel,
   b_linux_layout_asan, b_linux_layout_rel_32,
 ] + b_swarms + [
-  b_linux_chromeos_clang,
   b_win8_aura,
   b_linux_asan, b_linux_browser_asan, b_linux_clang_tsan,
   b_linux_chromeos_asan,
   b_linux_chromeos_browser_asan,
   b_mac_asan, b_mac_asan_64, b_mac_xcodebuild,
   b_linux_redux,
   b_linux_nacl_sdk, b_win_nacl_sdk, b_mac_nacl_sdk,
   b_linux_nacl_sdk_build, b_win_nacl_sdk_build, b_mac_nacl_sdk_build,
   b_valgrind_mac_alt,
   b_mac_nacl_sdk_alt,
@@ skipping 187 matching lines @@
 #  base.make_stop_form = hack_stop(base.make_stop_form)
 
 
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # vi: set ts=4 sts=2 sw=2 et: