cc: Remove GetPreferredTryMasters from cc/PRESUBMIT.py.

GetPreferredTryMasters overrides the set of default trybots for
'git cl try' but we only want to run the linux_blink_rel trybot in the
CQ.

BUG=581850
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

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

Cr-Commit-Position: refs/heads/master@{#372273}

1 files changed, 5 insertions, 13 deletions

diff --git a/cc/PRESUBMIT.py b/cc/PRESUBMIT.py
index f044943..d79ca80 100644
--- a/cc/PRESUBMIT.py
+++ b/cc/PRESUBMIT.py
@@ -325,13 +325,6 @@ def CheckChangeOnUpload(input_api, output_api):
   results += input_api.canned_checks.CheckPatchFormatted(input_api, output_api)
   return results
 
-def GetPreferredTryMasters(project, change):
-  return {
-    'tryserver.blink': {
-      'linux_blink_rel': set(['defaulttests']),
-    },
-  }
-
 def PostUploadHook(cl, change, output_api):
   """git cl upload will call this hook after the issue is created/modified.
 
@@ -344,16 +337,15 @@ def PostUploadHook(cl, change, output_api):
   if re.search(r'^CQ_INCLUDE_TRYBOTS=.*', description, re.M | re.I):
     return []
 
-  bots = GetPreferredTryMasters(None, change)
-  bots_string_bits = []
-  for master in bots.keys():
-    bots_string_bits.append("%s:%s" % (master, ','.join(bots[master].keys())))
+  bots = [
+    'tryserver.blink:linux_blink_rel',
+  ]
 
   results = []
   new_description = description
-  new_description += '\nCQ_INCLUDE_TRYBOTS=%s' % ';'.join(bots_string_bits)
+  new_description += '\nCQ_INCLUDE_TRYBOTS=%s' % ';'.join(bots)
   results.append(output_api.PresubmitNotifyResult(
-      'Automatically added Perf trybots to run Blink tests on CQ.'))
+      'Automatically added Blink trybots to run Blink tests on CQ.'))
 
   if new_description != description:
     rietveld_obj.update_description(issue, new_description)