WebRTC: Move TSan v2 and SyzyASan bots to main build+try masters.

masters/master.client.webrtc.fyi/master_linux_cfg.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.
 
 from master import master_config
 from master.factory import webrtc_factory
 
 defaults = {}
 
 def linux():
@@ skipping 22 matching lines @@
     'system_wrappers_unittests',
     'test_support_unittests',
     'tools_unittests',
     'video_engine_core_unittests',
     'video_engine_tests',
     'voice_engine_unittests',
 ]
 
 defaults['category'] = 'linux'
 
-B('Linux Tsan v2', 'linux_tsan2_factory', scheduler=scheduler)
-F('linux_tsan2_factory', linux().WebRTCFactory(
-    target='Release',
-    tests=tests,
-    options=['--compiler=goma-clang'],
-    factory_properties={
-        'tsan': True,
-        'tsan_suppressions_file':
-            'src/tools/valgrind-webrtc/tsan_v2/suppressions.txt',
-        'gclient_env': {
-            'GYP_DEFINES': 'tsan=1 use_allocator=none release_extra_cflags=-g',
-    }}))
-
 B('Linux TsanRV', 'linux_tsan_rv_factory', scheduler=scheduler)
 F('linux_tsan_rv_factory', linux().WebRTCFactory(
     target='Release',
     tests=['tsan_rv_' + test for test in tests],
     options=['--compiler=goma'],
     factory_properties={
         'needs_valgrind': True,
         'gclient_env': {'GYP_DEFINES': 'build_for_tool=tsan'}}))
 
 B('Linux LSan (and ASan)', 'linux_lsan_factory', scheduler=scheduler)
 F('linux_lsan_factory', linux().WebRTCFactory(
     target='Release',
     tests=tests,
     options=['--compiler=goma-clang'],
     factory_properties={
         'lsan': True,
         'asan': True,
         'gclient_env': {
             'GYP_DEFINES': ('asan=1 '
                             'lsan=1 '
                             'use_allocator=none '
                             'release_extra_cflags=-g ')}}))
 
 
 def Update(c):
   helper.Update(c)