More sync of PRESUBMIT with what CQ runs

This removes some configs that were here below in an attempt to reduce
the tryserver load.

They can be added later slowly after we verify they don't cause unnecessary
load. Note that CQ was not checking them anyway, so they were losing at least
50% CL coverage.

TBR=maruel

BUG=317931

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

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

17 files changed, 25 insertions, 32 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index b5a873e..19d14c4 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1323,6 +1323,7 @@ def GetDefaultTryConfigs(bots=None):
           'telemetry_unittests',
       ],
       'win': ['compile'],
+      'win_chromium_compile_dbg': ['defaulttests'],
       'win_nacl_sdk_build': ['compile'],
       'win_rel': standard_tests + [
           'app_list_unittests',
@@ -1412,7 +1413,6 @@ def GetPreferredTryMasters(project, change):
     return GetDefaultTryConfigs([
         'mac_chromium_compile_dbg',
         'mac_chromium_rel',
-        'mac_rel'
     ])
   if all(re.search('(^|[/_])win[/_.]', f) for f in files):
     return GetDefaultTryConfigs(['win', 'win_rel'])
@@ -1430,19 +1430,12 @@ def GetPreferredTryMasters(project, change):
       'android_dbg',
       'ios_dbg_simulator',
       'ios_rel_device',
-      'linux_gtk',
-      'linux_asan',
       'linux_chromium_chromeos_rel',
       'linux_chromium_clang_dbg',
-      'linux_nacl_sdk_build',
       'linux_chromium_rel',
-      'linux_rel',
       'mac_chromium_compile_dbg',
-      'mac_nacl_sdk_build',
       'mac_chromium_rel',
-      'mac_rel',
-      'win',
-      'win_nacl_sdk_build',
+      'win_chromium_compile_dbg',
       'win_rel',
       'win_x64_rel',
   ]
diff --git a/ash/PRESUBMIT.py b/ash/PRESUBMIT.py
index 648c663..8753f92 100644
--- a/ash/PRESUBMIT.py
+++ b/ash/PRESUBMIT.py
@@ -11,6 +11,6 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_chromeos_clang': set(['defaulttests']),
+      'linux_chromium_chromeos_clang_dbg': set(['defaulttests']),
     }
   }
diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py
index 8082590..8067a0f 100644
--- a/base/PRESUBMIT.py
+++ b/base/PRESUBMIT.py
@@ -51,8 +51,8 @@ def CheckChangeOnCommit(input_api, output_api):
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_rel': set(['sync_integration_tests']),
-      'mac_rel': set(['sync_integration_tests']),
+      'linux_chromium_rel': set(['defaulttests']),
+      'mac_chromium_rel': set(['defaulttests']),
       'win_rel': set(['sync_integration_tests']),
     }
   }
diff --git a/cc/PRESUBMIT.py b/cc/PRESUBMIT.py
index f566560..a779483 100644
--- a/cc/PRESUBMIT.py
+++ b/cc/PRESUBMIT.py
@@ -227,7 +227,7 @@ def CheckChangeOnUpload(input_api, output_api):
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_layout_rel': set(['defaulttests']),
+      'linux_blink_rel': set(['defaulttests']),
       'linux_gpu': set(['defaulttests']),
       'mac_gpu': set(['defaulttests']),
       'win_gpu': set(['defaulttests']),
diff --git a/chrome/browser/extensions/PRESUBMIT.py b/chrome/browser/extensions/PRESUBMIT.py
index 5e5a4d9b..31cac0c 100644
--- a/chrome/browser/extensions/PRESUBMIT.py
+++ b/chrome/browser/extensions/PRESUBMIT.py
@@ -11,7 +11,7 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_chromeos': set(['defaulttests']),
+      'linux_chromium_chromeos_rel': set(['defaulttests']),
     }
   }
 
diff --git a/chrome/browser/policy/PRESUBMIT.py b/chrome/browser/policy/PRESUBMIT.py
index b3c43e5..eb7515e 100644
--- a/chrome/browser/policy/PRESUBMIT.py
+++ b/chrome/browser/policy/PRESUBMIT.py
@@ -11,7 +11,7 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_chromeos': set(['defaulttests']),
-      'linux_chromeos_clang': set(['compile']),
+      'linux_chromium_chromeos_rel': set(['defaulttests']),
+      'linux_chromium_chromeos_clang_dbg': set(['defaulttests']),
     }
   }
diff --git a/chrome/browser/sync/PRESUBMIT.py b/chrome/browser/sync/PRESUBMIT.py
index a04a1d8..715bb60 100644
--- a/chrome/browser/sync/PRESUBMIT.py
+++ b/chrome/browser/sync/PRESUBMIT.py
@@ -11,8 +11,8 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_rel': set(['sync_integration_tests']),
-      'mac_rel': set(['sync_integration_tests']),
+      'linux_chromium_rel': set(['defaulttests']),
+      'mac_chromium_rel': set(['defaulttests']),
       'win_rel': set(['sync_integration_tests']),
     }
   }
diff --git a/chrome/browser/ui/libgtk2ui/PRESUBMIT.py b/chrome/browser/ui/libgtk2ui/PRESUBMIT.py
index 269f39d..99a2232 100755
--- a/chrome/browser/ui/libgtk2ui/PRESUBMIT.py
+++ b/chrome/browser/ui/libgtk2ui/PRESUBMIT.py
@@ -13,6 +13,6 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_rel': set(['defaulttests']),
+      'linux_chromium_rel': set(['defaulttests']),
     }
   }
diff --git a/chrome/browser/ui/views/PRESUBMIT.py b/chrome/browser/ui/views/PRESUBMIT.py
index 24df20c..4b4c964 100644
--- a/chrome/browser/ui/views/PRESUBMIT.py
+++ b/chrome/browser/ui/views/PRESUBMIT.py
@@ -11,6 +11,6 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_chromeos': set(['defaulttests']),
+      'linux_chromium_chromeos_rel': set(['defaulttests']),
     }
   }
diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRESUBMIT.py
index 5a28e5a..3c61a3e 100644
--- a/chrome/browser/ui/webui/PRESUBMIT.py
+++ b/chrome/browser/ui/webui/PRESUBMIT.py
@@ -11,6 +11,6 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_chromeos': set(['defaulttests']),
+      'linux_chromium_chromeos_rel': set(['defaulttests']),
     }
   }
diff --git a/chrome/common/net/PRESUBMIT.py b/chrome/common/net/PRESUBMIT.py
index a904e7b..ffcf801 100644
--- a/chrome/common/net/PRESUBMIT.py
+++ b/chrome/common/net/PRESUBMIT.py
@@ -11,8 +11,8 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_rel': set(['sync_integration_tests']),
-      'mac_rel': set(['sync_integration_tests']),
+      'linux_chromium_rel': set(['defaulttests']),
+      'mac_chromium_rel': set(['defaulttests']),
       'win_rel': set(['sync_integration_tests']),
     }
   }
diff --git a/extensions/browser/PRESUBMIT.py b/extensions/browser/PRESUBMIT.py
index 6369255..29a709b 100644
--- a/extensions/browser/PRESUBMIT.py
+++ b/extensions/browser/PRESUBMIT.py
@@ -11,7 +11,7 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_chromeos': set(['defaulttests']),
+      'linux_chromium_chromeos_rel': set(['defaulttests']),
     }
   }
 
diff --git a/jingle/PRESUBMIT.py b/jingle/PRESUBMIT.py
index efbfc0c..f022b03 100644
--- a/jingle/PRESUBMIT.py
+++ b/jingle/PRESUBMIT.py
@@ -11,8 +11,8 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_rel': set(['sync_integration_tests']),
-      'mac_rel': set(['sync_integration_tests']),
+      'linux_chromium_rel': set(['defaulttests']),
+      'mac_chromium_rel': set(['defaulttests']),
       'win_rel': set(['sync_integration_tests']),
     }
   }
diff --git a/net/PRESUBMIT.py b/net/PRESUBMIT.py
index 4c0ac24..8ac6ca6 100644
--- a/net/PRESUBMIT.py
+++ b/net/PRESUBMIT.py
@@ -11,8 +11,8 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   masters = {
     'tryserver.chromium': {
-      'linux_rel': set(['sync_integration_tests']),
-      'mac_rel': set(['sync_integration_tests']),
+      'linux_chromium_rel': set(['defaulttests']),
+      'mac_chromium_rel': set(['defaulttests']),
       'win_rel': set(['sync_integration_tests']),
     }
   }
diff --git a/skia/PRESUBMIT.py b/skia/PRESUBMIT.py
index 15dfe35..080deed 100644
--- a/skia/PRESUBMIT.py
+++ b/skia/PRESUBMIT.py
@@ -14,6 +14,6 @@ def GetPreferredTryMasters(project, change):
       'linux_gpu': set(['defaulttests']),
       'win_gpu': set(['defaulttests']),
       'mac_gpu': set(['defaulttests']),
-      'linux_layout_rel': set(['defaulttests']),
+      'linux_blink_rel': set(['defaulttests']),
     }
   }
diff --git a/sync/PRESUBMIT.py b/sync/PRESUBMIT.py
index aad404c..80e8892 100644
--- a/sync/PRESUBMIT.py
+++ b/sync/PRESUBMIT.py
@@ -11,8 +11,8 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_rel': set(['sync_integration_tests']),
-      'mac_rel': set(['sync_integration_tests']),
+      'linux_chromium_rel': set(['defaulttests']),
+      'mac_chromium_rel': set(['defaulttests']),
       'win_rel': set(['sync_integration_tests']),
     }
   }
diff --git a/ui/compositor/PRESUBMIT.py b/ui/compositor/PRESUBMIT.py
index 9c2df47..d99d85d 100644
--- a/ui/compositor/PRESUBMIT.py
+++ b/ui/compositor/PRESUBMIT.py
@@ -11,6 +11,6 @@ for more details on the presubmit API built into gcl.
 def GetPreferredTryMasters(project, change):
   return {
     'tryserver.chromium': {
-      'linux_chromeos': set(['defaulttests']),
+      'linux_chromium_chromeos_rel': set(['defaulttests']),
     }
   }