Remove _swarming bots.

scripts/slave/recipes/chromium_trybot.py

 # Copyright 2013 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.
 
 DEPS = [
   'bot_update',
   'chromium',
   'chromium_tests',
   'gclient',
   'isolate',
@@ skipping 531 matching lines @@
         'compile_only': False,
         'testing': {
           'platform': 'win',
         },
       },
     },
   },
 }
 
 
-def add_swarming_builder(original, swarming, server):
-  """Duplicates builder config on |server|, adding 'enable_swarming: True'."""
-  assert server in BUILDERS
-  assert original in BUILDERS[server]['builders']
-  assert swarming not in BUILDERS[server]['builders']
-  conf = BUILDERS[server]['builders'][original].copy()
-  conf['enable_swarming'] = True
-  BUILDERS[server]['builders'][swarming] = conf
-
-
 def get_test_names(tests):
   """Returns the names of each of the tests in |tests|."""
   return [test.name for test in tests]
 
 
 def filter_tests(possible_tests, needed_tests):
   """Returns a list of all the tests in |possible_tests| whose name is in
   |needed_tests|."""
   result = []
   for test in possible_tests:
@@ skipping 17 matching lines @@
   return sorted(set(x
                     for test in tests
                     for x in test.compile_targets(api)))
 
 
 def find_test_named(test_name, tests):
   """Returns a list with all tests whose name matches |test_name|."""
   return [test for test in tests if test.name == test_name]
 
 
-add_swarming_builder('linux_chromium_rel', 'linux_chromium_rel_swarming',
-                     'tryserver.chromium.linux')
-add_swarming_builder('linux_chromium_chromeos_rel',
-                     'linux_chromium_chromeos_rel_swarming',
-                     'tryserver.chromium.linux')
-add_swarming_builder('win_chromium_rel', 'win_chromium_rel_swarming',
-                     'tryserver.chromium.win')
-add_swarming_builder('win_chromium_x64_rel', 'win_chromium_x64_rel_swarming',
-                     'tryserver.chromium.win')
-add_swarming_builder('mac_chromium_rel', 'mac_chromium_rel_swarming',
-                     'tryserver.chromium.mac')
-
-
 def build_to_priority(build_properties):
   """Returns the Swarming task priority for the build.
 
   Does this by determining the build type. Lower is higher priority.
   """
   requester = build_properties.get('requester')
   if requester == 'commit-bot@chromium.org':
     # Commit queue job.
     return 30
   # Normal try job.
@@ skipping 601 matching lines @@
         api.json.output([
             {
                 'error': 'Must not have executable bit set',
                 'rel_path': 'base/basictypes.h',
             },
         ]))
   )
 
   yield (
     api.test('check_swarming_version_failure') +
-    props(buildername='linux_chromium_rel_swarming') +
+    props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.step_data('swarming.py --version', retcode=1) +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
         ],
       })
@@ skipping 20 matching lines @@
                 'filename': 'base/basictypes.h',
                 'license': 'UNKNOWN',
             },
         ]))
   )
 
   # Successfully compiling, isolating and running two targets on swarming for a
   # commit queue job.
   yield (
     api.test('swarming_basic_cq') +
-    props(buildername='linux_chromium_rel_swarming') +
+    props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
             'swarming': {
@@ skipping 16 matching lines @@
     api.override_step_data(
         'find isolated tests',
         api.isolate.output_json(['base_unittests', 'browser_tests']))
   )
 
   # Successfully compiling, isolating and running two targets on swarming for a
   # manual try job.
   yield (
     api.test('swarming_basic_try_job') +
     props(
-        buildername='linux_chromium_rel_swarming',
+        buildername='linux_chromium_rel',
         requester='joe@chromium.org') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
@@ skipping 15 matching lines @@
         },
      })) +
     api.override_step_data(
         'find isolated tests',
         api.isolate.output_json(['base_unittests', 'browser_tests']))
   )
 
   # One target (browser_tests) failed to produce *.isolated file.
   yield (
     api.test('swarming_missing_isolated') +
-    props(buildername='linux_chromium_rel_swarming') +
+    props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
             'swarming': {'can_use_on_swarming_builders': True},
@@ skipping 11 matching lines @@
      })) +
     api.override_step_data(
         'find isolated tests',
         api.isolate.output_json(['base_unittests']))
   )
 
   # One test (base_unittest) failed on swarming. It is retried with
   # deapplied patch.
   yield (
     api.test('swarming_deapply_patch') +
-    props(buildername='linux_chromium_rel_swarming') +
+    props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
             'swarming': {'can_use_on_swarming_builders': True},
@@ skipping 169 matching lines @@
           },
         ],
       })
     ) +
     api.override_step_data(
       'analyze',
       api.json.output({'status': 'Found dependency',
                        'targets': ['browser_tests', 'base_unittests'],
                        'build_targets': ['base_unittests']}))
   )