Remove obsolete trybots, round #1

masters/master.tryserver.chromium.linux/master.cfg

Index: masters/master.tryserver.chromium.linux/master.cfg
diff --git a/masters/master.tryserver.chromium.linux/master.cfg b/masters/master.tryserver.chromium.linux/master.cfg
index 6335abc7380f956a3bd61e7f842f6044afe08c7e..906251c9c4ab8e7798833f3e8f2d33a3ff98512b 100644
--- a/masters/master.tryserver.chromium.linux/master.cfg
+++ b/masters/master.tryserver.chromium.linux/master.cfg
@@ -162,16 +162,6 @@ linux_tests_full_name = [
 ] + chromium_factory.blink_tests_for_chromium_tryjobs
 
 
-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})
-
 b_linux_rel_precise32 = CreateBuilder(
     platform='linux',
     target='Release',
@@ -330,126 +320,6 @@ b_android_clang_dbg_recipe_experimental = {
     'factory': m_annotator.BaseFactory('android/builder')
 }
 
-b_valgrind_linux = {
-  'name': 'linux_valgrind',
-  'factory': m_chromium_linux.ChromiumFactory(
-      slave_type='Trybot',
-      target='Release',
-      options=[
-        '--compiler=goma',
-        'accessibility_unittests',
-        'blink_tests',
-        'base_unittests',
-        'cast_unittests',
-        'components_unittests',
-        'content_unittests',
-        'crypto_unittests',
-        'device_unittests',
-        'display_unittests',
-        'gcm_unit_tests',
-        'gfx_unittests',
-        'google_apis_unittests',
-        'gpu_unittests',
-        'ipc_tests',
-        'jingle_unittests',
-        'media_unittests',
-        'net_unittests',
-        'ppapi_unittests',
-        'printing_unittests',
-        'remoting_unittests',
-        'sandbox_linux_unittests',
-        'sql_unittests',
-        'sync_unit_tests',
-        'ui_base_unittests',
-        'unit_tests',
-        'url_unittests',
-      ],
-      tests=master_config_tryserver.valgrind_tests([
-        # TODO(timurrrr): We might consider sorting these by run time instead.
-        'base_unittests',
-        'cast',
-        'components',
-        'content',
-        'crypto_unittests',
-        'display_unittests',
-        'gcm_unit_tests',
-        'gpu',
-        'ipc_tests',
-        'jingle',
-        'media',
-        'net',
-        'ppapi_unittests',
-        'printing',
-        'remoting',
-        'sandbox',
-        'sql',
-        'sync',
-        'unit',
-        'url',
-      ]),
-      factory_properties={
-        'needs_valgrind': True,
-        'gclient_env': {
-            'GYP_DEFINES': master_config_tryserver.valgrind_gyp_defines
-        }
-      }
-  ),
-}
-
-# browser_tests takes too long
-b_linux_chromeos_valgrind = {
-  'name': 'linux_chromeos_valgrind',
-  'factory': m_chromium_chromiumos.ChromiumOSFactory(
-      slave_type='Trybot',
-      target='Release',
-      options=['--compiler=goma'] + extract_options(linux_chromeos_tests),
-      tests=master_config_tryserver.valgrind_tests([
-              'accessibility_unittests',
-              'ash',
-              'app_list',
-              'base',
-              'cacheinvalidation_unittests',
-              'cast',
-              'chromeos',
-              'compositor',
-              'components',
-              'content',
-              'crypto',
-              'dbus_unittests',
-              'device',
-              'display_unittests',
-              'events',
-              'gcm',
-              'gfx_unittests',
-              'google_apis_unittests',
-              'gpu',
-              'ipc',
-              'jingle',
-              'keyboard_unittests',
-              'media',
-              'message_center',
-              'nacl_loader_unittests',
-              'net',
-              'ppapi',
-              'printing',
-              'remoting_unittests',
-              'sandbox',
-              'sql',
-              'sync',
-              'ui_unit',
-              'unit',
-              'url',
-              'views',
-            ]),
-      factory_properties={
-        'needs_valgrind': True,
-        'gclient_env': {
-          'GYP_DEFINES': (master_config_tryserver.valgrind_gyp_defines +
-                          ' chromeos=1'
-                          ' ffmpeg_branding=ChromeOS'
-                          ' proprietary_codecs=1')}})
-}
-
 # WebKit Layout builders
 b_linux_layout = {
   'name': 'linux_layout',
@@ -791,57 +661,6 @@ b_linux_chromeos_browser_asan = {
       }),
 }
 
-b_linux_redux = {
-  'name': 'linux_redux',
-  'factory': m_chromium_linux.ChromiumFactory(
-      slave_type='Trybot',
-      options=[
-        '--compiler=goma',
-        'accessibility_unittests',
-        'base_unittests',
-        'cacheinvalidation_unittests',
-        'content_unittests',
-        'crypto_unittests',
-        'device_unittests',
-        'display_unittests',
-        'gcm_unit_tests',
-        'gfx_unittests',
-        'ipc_tests',
-        'jingle_unittests',
-        'media_unittests',
-        'net_unittests',
-        'ppapi_unittests',
-        'printing_unittests',
-        'remoting_unittests',
-        'sql_unittests',
-        'sync_unit_tests',
-        'ui_base_unittests',
-        'unit_tests',
-        'url_unittests',
-      ],
-      tests=[
-        'base_unittests',
-        'cacheinvalidation_unittests',
-        'crypto_unittests',
-        'device_unittests',
-        'display_unittests',
-        'jingle',
-        'net',
-        'unit',
-      ],
-      factory_properties={
-        'gclient_env': {
-          'GYP_DEFINES': ('linux_fpic=1 '
-                          'enable_touch_events=1 '
-                          'disable_nacl=1 '
-                          'use_allocator=none '
-                          'linux_breakpad=0 '
-                          'remoting=0 '
-                          'configuration_policy=0 '
-                          'safe_browsing=0 '
-                          'use_openssl=1 ')}}),
-}
-
 # NaCl SDK try bots
 b_linux_nacl_sdk = CreateBuilder(
     platform='linux',
@@ -895,7 +714,6 @@ b_tools_build_presubmit = presubmit('tools_build')
 
 c['builders'] = [
   b_linux_rel_precise32,
-  b_linux_rel_naclmore,
   b_android_dbg_tests_recipe, b_android_arm64_dbg_recipe,
   b_android_fyi_dbg_tests_recipe,
   b_android_x86_dbg,
@@ -906,8 +724,6 @@ c['builders'] = [
   b_android_clang_dbg_recipe_experimental,
   b_android_rel_tests_recipe,
   b_android_aosp,
-  b_valgrind_linux,
-  b_linux_chromeos_valgrind,
   b_linux_layout,
   b_linux_layout_rel,
   b_linux_layout_asan, b_linux_layout_rel_32,
@@ -916,7 +732,6 @@ c['builders'] = [
   b_linux_chromium_asan_rel_ng,
   b_linux_chromeos_asan,
   b_linux_chromeos_browser_asan,
-  b_linux_redux,
   b_linux_nacl_sdk, b_linux_nacl_sdk_bionic,
   b_linux_nacl_sdk_build, b_linux_nacl_sdk_bionic_build,
   b_blink_presubmit, b_chromium_presubmit,