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

masters/master.tryserver.chromium/slaves.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.
 
 # See master.experimental/slaves.cfg for documentation.
 
 
 def expand_extra_builders(extras, total):
@@ skipping 28 matching lines @@
   linux_arm_cross_slaves = range(493, 496)
   linux_arm_testers = [9]
 
   # Have a dedicated pool for presubmit jobs - all CQ jobs
   # need a presubmit first and so must be responsive.
   presubmit_builders = ['chromium_presubmit', 'blink_presubmit']
 
   # Configurations on every VM.
   base = presubmit_builders + [
     # One line per shared directory. In decreasing usage:
-    'linux', 'linux_rel',
     'linux_chromium_dbg', 'linux_chromium_rel',
     'linux_chromium_compile_dbg', 'linux_chromium_compile_rel',
     'linux_rel_naclmore',
     'linux_chromium_gn_dbg', 'linux_chromium_gn_rel',
     'android_chromium_gn_compile_dbg', 'android_chromium_gn_compile_rel',
 
-    'linux_clang', 'linux_chromium_clang_dbg', 'linux_chromium_clang_rel',
+    'linux_chromium_clang_dbg', 'linux_chromium_clang_rel',
 
-    'linux_chromeos',
     'linux_chromium_chromeos_dbg', 'linux_chromium_chromeos_rel',
     'linux_nacl_sdk_build',
 
     'tools_build_presubmit',
   ]
 
   # One of the extra configuration per VM.
   # First the ones barely used. By reducing the number of available slaves, we
   # increase the "cache locally" of having a checkout already recent on the
   # slave.
   extras = [
-    [['linux_chromeos_clang',
-      'linux_chromium_chromeos_clang_dbg',
+    [['linux_chromium_chromeos_clang_dbg',
       'linux_chromium_chromeos_clang_rel'], 15],
     [['linux_chromeos_valgrind'], 2],
     [['linux_valgrind', 'linux_tsan'], 4],
     [['linux_chromeos_asan', 'linux_chromeos_browser_asan'], 6],
     [['linux_redux'], 2],
     [['linux_nacl_sdk'], 3],
     [['linux_ecs_ozone'], 3],
     # These ones below are significantly used ones. They use all the remaining
     # slaves.
     [['linux_asan', 'linux_browser_asan'], -1],
@@ skipping 196 matching lines @@
       'os': 'mac',
       'version': '10.6',
       'bits': '64',
     } for index, number in enumerate(all_old_slaves)
   ]
   out.extend(
     {
       'master': 'TryServer',
       'builder': [
           # One line per shared directory:
-          'mac', 'mac_rel', 'mac_rel_naclmore',
+          'mac_rel_naclmore',
           'mac_chromium_dbg', 'mac_chromium_rel',
           'mac_chromium_compile_dbg', 'mac_chromium_compile_rel',
 
           'mac_valgrind_alt',
           'mac_asan',
           'mac_nacl_sdk_alt',
           'mac_nacl_sdk_build'
       ],
       'hostname': 'vm%d-m4' % i,
       'os': 'mac',
@@ skipping 198 matching lines @@
   # The split is because the combined binaries of both rel and debug is
   # 40GB, but they're just 15GB/25GB individually, and splitting them will
   # help us mitigate disk space issues on our 60GB bots.
   win7_rel = win7[:len(win7)*5/6]
   win7_dbg = win7[len(win7)*5/6:]
 
   normal_slaves_rel = [
     {
       'master': 'TryServer',
       'builder': [
-        'win', 'win_rel_naclmore', 'win_rel',
+        'win_rel_naclmore',
         'win_chromium_rel', 'win_chromium_compile_rel',
         'win_nacl_sdk_build'
       ],
       'hostname': 'vm%d-m4' % number,
       'os': 'win',
       'version': 'win7',
       'bits': '64',
     } for number in win7_rel
   ]
   normal_slaves_dbg = [
     {
       'master': 'TryServer',
       'builder': ['win_chromium_dbg', 'win_chromium_compile_dbg'],
       'hostname': 'vm%d-m4' % number,
       'os': 'win',
       'version': 'win7',
       'bits': '64',
     } for number in win7_dbg
   ]
   win_x64_slaves = [
     {
       'master': 'TryServer',
       'builder': [
-        'win_x64_rel', 'win_chromium_x64_dbg', 'win_chromium_x64_rel'
+        'win_chromium_x64_dbg', 'win_chromium_x64_rel'
       ],
       'hostname': 'vm%d-m4' % number,
       'os': 'win',
       'version': 'win7',
       'bits': '64',
     } for number in win7_x64
   ]
   nacl_sdk_slaves = [
     {
       'master': 'TryServer',
@@ skipping 159 matching lines @@
       swarm_slaves +
       win_tsan_slave +
       win_x64_slaves +
       swarm_win7_dumb_slaves +
       swarm_winxp_dumb_slaves +
       perf_bisect_slaves +
       perf_bisect_builders)
 
 
 slaves = linux() + mac() + windows() + android() + ios()