Merge pull request #22397 from jtattermusch/matrix_no_old_sanitizers

Remove run_tests.py based sanitizers from run_tests_matrix.py

tools/run_tests/run_tests_matrix.py

@@ -30,13 +30,9 @@ os.chdir(_ROOT)
 
 _DEFAULT_RUNTESTS_TIMEOUT = 1 * 60 * 60
 
-# Set the timeout high to allow enough time for sanitizers and pre-building
-# clang docker.
+# C/C++ tests can take long time
 _CPP_RUNTESTS_TIMEOUT = 4 * 60 * 60
 
-# C++ TSAN takes longer than other sanitizers
-_CPP_TSAN_RUNTESTS_TIMEOUT = 8 * 60 * 60
-
 # Set timeout high for ObjC for Cocoapods to install pods
 _OBJC_RUNTESTS_TIMEOUT = 90 * 60
 
@@ -261,35 +257,6 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
                                 inner_jobs=inner_jobs,
                                 timeout_seconds=_OBJC_RUNTESTS_TIMEOUT)
 
-    # sanitizers
-    test_jobs += _generate_jobs(languages=['c'],
-                                configs=['msan', 'asan', 'tsan', 'ubsan'],
-                                platforms=['linux'],
-                                arch='x64',
-                                compiler='clang7.0',
-                                labels=['sanitizers', 'corelang'],
-                                extra_args=extra_args,
-                                inner_jobs=inner_jobs,
-                                timeout_seconds=_CPP_RUNTESTS_TIMEOUT)
-    test_jobs += _generate_jobs(languages=['c++'],
-                                configs=['asan'],
-                                platforms=['linux'],
-                                arch='x64',
-                                compiler='clang7.0',
-                                labels=['sanitizers', 'corelang'],
-                                extra_args=extra_args,
-                                inner_jobs=inner_jobs,
-                                timeout_seconds=_CPP_RUNTESTS_TIMEOUT)
-    test_jobs += _generate_jobs(languages=['c++'],
-                                configs=['tsan'],
-                                platforms=['linux'],
-                                arch='x64',
-                                compiler='clang7.0',
-                                labels=['sanitizers', 'corelang'],
-                                extra_args=extra_args,
-                                inner_jobs=inner_jobs,
-                                timeout_seconds=_CPP_TSAN_RUNTESTS_TIMEOUT)
-
     return test_jobs