summaryrefslogtreecommitdiffstats
path: root/net/PRESUBMIT.py
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-11 21:45:27 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-11 21:45:27 +0000
commit1c649fa48d64339fcd0ba358cd429ff1341272af (patch)
treeef28ecc5d4a216d5db23e0cc8e0f41bb628101f6 /net/PRESUBMIT.py
parente2f1dce380628941ecb46bf5191ca7f3e8bfb9ee (diff)
downloadchromium_src-1c649fa48d64339fcd0ba358cd429ff1341272af.zip
chromium_src-1c649fa48d64339fcd0ba358cd429ff1341272af.tar.gz
chromium_src-1c649fa48d64339fcd0ba358cd429ff1341272af.tar.bz2
Convert most Chromium presubmit files to use new multiple-tryserver-compatible protocol
BUG=334892 R=maruel@chromium.org Review URL: https://codereview.chromium.org/194903007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/PRESUBMIT.py')
-rw-r--r--net/PRESUBMIT.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/net/PRESUBMIT.py b/net/PRESUBMIT.py
index 3a2f213..4c0ac24 100644
--- a/net/PRESUBMIT.py
+++ b/net/PRESUBMIT.py
@@ -8,14 +8,17 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
for more details on the presubmit API built into gcl.
"""
-def GetPreferredTrySlaves(project, change):
- slaves = [
- 'linux_rel:sync_integration_tests',
- 'mac_rel:sync_integration_tests',
- 'win_rel:sync_integration_tests',
- ]
+def GetPreferredTryMasters(project, change):
+ masters = {
+ 'tryserver.chromium': {
+ 'linux_rel': set(['sync_integration_tests']),
+ 'mac_rel': set(['sync_integration_tests']),
+ 'win_rel': set(['sync_integration_tests']),
+ }
+ }
# Changes that touch NSS files will likely need a corresponding OpenSSL edit.
# Conveniently, this one glob also matches _openssl.* changes too.
if any('nss' in f.LocalPath() for f in change.AffectedFiles()):
- slaves.append('linux_redux')
- return slaves
+ masters['tryserver.chromium'].setdefault(
+ 'linux_redux', set()).add('defaulttests')
+ return masters