Update presubmit default trybots to be more similar to CQ config

BUG=317931
R=maruel@chromium.org

Review URL: https://codereview.chromium.org/179453003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253867 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 42 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index f8e7f44..b6f8c06 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1271,55 +1271,20 @@ def GetDefaultTryConfigs(bots=None):
       #TODO(stip): Change the name of this builder to reflect that it's release.
       'linux_gtk': standard_tests,
       'linux_chromeos_asan': ['defaulttests'],
-      'linux_chromeos_clang': ['compile'],
-      # Note: It is a Release builder even if its name convey otherwise.
-      'linux_chromeos': standard_tests + [
-          'app_list_unittests',
-          'aura_unittests',
-          'ash_unittests',
-          'chromeos_unittests',
-          'components_unittests',
-          'dbus_unittests',
-          'device_unittests',
-          'events_unittests',
-          'google_apis_unittests',
-          'sandbox_linux_unittests',
-      ],
-      'linux_chromium_dbg': ['defaulttests'],
+      'linux_chromium_chromeos_clang_dbg': ['defaulttests'],
+      'linux_chromium_chromeos_rel': ['defaulttests'],
+      'linux_chromium_compile_dbg': ['defaulttests'],
       'linux_chromium_rel': ['defaulttests'],
-      'linux_clang': ['compile'],
+      'linux_chromium_clang_dbg': ['defaulttests'],
       'linux_nacl_sdk_build': ['compile'],
-      'linux_rel': standard_tests + [
-          'app_list_unittests',
-          'aura_unittests',
-          'cc_unittests',
-          'chromedriver_unittests',
-          'components_unittests',
-          'compositor_unittests',
-          'events_unittests',
-          'google_apis_unittests',
-          'nacl_integration',
-          'remoting_unittests',
-          'sandbox_linux_unittests',
-          'sync_integration_tests',
+      'linux_rel': [
           'telemetry_perf_unittests',
           'telemetry_unittests',
       ],
-      'mac': ['compile'],
-      'mac_chromium_dbg': ['defaulttests'],
+      'mac_chromium_compile_dbg': ['defaulttests'],
       'mac_chromium_rel': ['defaulttests'],
       'mac_nacl_sdk_build': ['compile'],
-      'mac_rel': standard_tests + [
-          'app_list_unittests',
-          'cc_unittests',
-          'chromedriver_unittests',
-          'components_unittests',
-          'gfx_unittests',
-          'google_apis_unittests',
-          'message_center_unittests',
-          'nacl_integration',
-          'remoting_unittests',
-          'sync_integration_tests',
+      'mac_rel': [
           'telemetry_perf_unittests',
           'telemetry_unittests',
       ],