From 1c649fa48d64339fcd0ba358cd429ff1341272af Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Tue, 11 Mar 2014 21:45:27 +0000 Subject: [PATCH] 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 --- ash/PRESUBMIT.py | 8 ++++++-- base/PRESUBMIT.py | 14 ++++++++------ chrome/browser/extensions/PRESUBMIT.py | 8 ++++++-- chrome/browser/policy/PRESUBMIT.py | 12 +++++++----- chrome/browser/sync/PRESUBMIT.py | 14 ++++++++------ chrome/browser/ui/libgtk2ui/PRESUBMIT.py | 8 ++++++-- chrome/browser/ui/views/PRESUBMIT.py | 8 ++++++-- chrome/browser/ui/webui/PRESUBMIT.py | 8 ++++++-- chrome/common/net/PRESUBMIT.py | 14 ++++++++------ crypto/PRESUBMIT.py | 9 ++++++--- extensions/browser/PRESUBMIT.py | 8 ++++++-- gpu/PRESUBMIT.py | 16 +++++++++------- jingle/PRESUBMIT.py | 14 ++++++++------ native_client_sdk/PRESUBMIT.py | 20 +++++++++++--------- net/PRESUBMIT.py | 19 +++++++++++-------- skia/PRESUBMIT.py | 18 ++++++++++-------- sync/PRESUBMIT.py | 14 ++++++++------ third_party/tcmalloc/PRESUBMIT.py | 8 ++++++-- tools/lsan/PRESUBMIT.py | 8 ++++++-- tools/valgrind/drmemory/PRESUBMIT.py | 8 ++++++-- tools/valgrind/memcheck/PRESUBMIT.py | 9 +++++++-- tools/valgrind/tsan/PRESUBMIT.py | 8 ++++++-- ui/compositor/PRESUBMIT.py | 8 ++++++-- ui/events/PRESUBMIT.py | 16 ++++++++++------ ui/gl/PRESUBMIT.py | 16 +++++++++------- 25 files changed, 186 insertions(+), 107 deletions(-) diff --git a/ash/PRESUBMIT.py b/ash/PRESUBMIT.py index 12b0c42e854f..648c6639fa9d 100644 --- a/ash/PRESUBMIT.py +++ b/ash/PRESUBMIT.py @@ -8,5 +8,9 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return ['linux_chromeos_clang'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_chromeos_clang': set(['defaulttests']), + } + } diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py index 7137c5a0101e..8082590f88fd 100644 --- a/base/PRESUBMIT.py +++ b/base/PRESUBMIT.py @@ -48,9 +48,11 @@ def CheckChangeOnCommit(input_api, output_api): return results -def GetPreferredTrySlaves(): - return [ - 'linux_rel:sync_integration_tests', - 'mac_rel:sync_integration_tests', - 'win_rel:sync_integration_tests', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_rel': set(['sync_integration_tests']), + 'mac_rel': set(['sync_integration_tests']), + 'win_rel': set(['sync_integration_tests']), + } + } diff --git a/chrome/browser/extensions/PRESUBMIT.py b/chrome/browser/extensions/PRESUBMIT.py index 776b2c7b058b..5e5a4d9b8033 100644 --- a/chrome/browser/extensions/PRESUBMIT.py +++ b/chrome/browser/extensions/PRESUBMIT.py @@ -8,8 +8,12 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return ['linux_chromeos'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_chromeos': set(['defaulttests']), + } + } def CheckChangeOnUpload(input_api, output_api): results = [] diff --git a/chrome/browser/policy/PRESUBMIT.py b/chrome/browser/policy/PRESUBMIT.py index da65b741c2a5..b3c43e5a7d83 100644 --- a/chrome/browser/policy/PRESUBMIT.py +++ b/chrome/browser/policy/PRESUBMIT.py @@ -8,8 +8,10 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return [ - 'linux_chromeos', - 'linux_chromeos_clang:compile', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_chromeos': set(['defaulttests']), + 'linux_chromeos_clang': set(['compile']), + } + } diff --git a/chrome/browser/sync/PRESUBMIT.py b/chrome/browser/sync/PRESUBMIT.py index 6f1fd3a4b07d..a04a1d8c0b20 100644 --- a/chrome/browser/sync/PRESUBMIT.py +++ b/chrome/browser/sync/PRESUBMIT.py @@ -8,9 +8,11 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return [ - 'linux_rel:sync_integration_tests', - 'mac_rel:sync_integration_tests', - 'win_rel:sync_integration_tests', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_rel': set(['sync_integration_tests']), + 'mac_rel': set(['sync_integration_tests']), + 'win_rel': set(['sync_integration_tests']), + } + } diff --git a/chrome/browser/ui/libgtk2ui/PRESUBMIT.py b/chrome/browser/ui/libgtk2ui/PRESUBMIT.py index 831b00135dfd..269f39dbbd1a 100755 --- a/chrome/browser/ui/libgtk2ui/PRESUBMIT.py +++ b/chrome/browser/ui/libgtk2ui/PRESUBMIT.py @@ -10,5 +10,9 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return ['linux_rel'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_rel': set(['defaulttests']), + } + } diff --git a/chrome/browser/ui/views/PRESUBMIT.py b/chrome/browser/ui/views/PRESUBMIT.py index e0c4e074812e..24df20c7767c 100644 --- a/chrome/browser/ui/views/PRESUBMIT.py +++ b/chrome/browser/ui/views/PRESUBMIT.py @@ -8,5 +8,9 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return ['linux_chromeos'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_chromeos': set(['defaulttests']), + } + } diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRESUBMIT.py index 8311e1ce9df0..5a28e5a441b2 100644 --- a/chrome/browser/ui/webui/PRESUBMIT.py +++ b/chrome/browser/ui/webui/PRESUBMIT.py @@ -8,5 +8,9 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return ['linux_chromeos'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_chromeos': set(['defaulttests']), + } + } diff --git a/chrome/common/net/PRESUBMIT.py b/chrome/common/net/PRESUBMIT.py index 01292eff5d73..a904e7bf70ea 100644 --- a/chrome/common/net/PRESUBMIT.py +++ b/chrome/common/net/PRESUBMIT.py @@ -8,9 +8,11 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return [ - 'linux_rel:sync_integration_tests', - 'mac_rel:sync_integration_tests', - 'win_rel:sync_integration_tests', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_rel': set(['sync_integration_tests']), + 'mac_rel': set(['sync_integration_tests']), + 'win_rel': set(['sync_integration_tests']), + } + } diff --git a/crypto/PRESUBMIT.py b/crypto/PRESUBMIT.py index 7d0a13576fdd..ce3988e50c68 100644 --- a/crypto/PRESUBMIT.py +++ b/crypto/PRESUBMIT.py @@ -8,7 +8,10 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(project, change): +def GetPreferredTryMasters(project, change): # Changes in crypto often need a corresponding OpenSSL edit. - return ['linux_redux'] - + return { + 'tryserver.chromium': { + 'linux_redux': set(['defaulttests']), + } + } diff --git a/extensions/browser/PRESUBMIT.py b/extensions/browser/PRESUBMIT.py index c8777a6f887d..6369255877d2 100644 --- a/extensions/browser/PRESUBMIT.py +++ b/extensions/browser/PRESUBMIT.py @@ -8,8 +8,12 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return ['linux_chromeos'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_chromeos': set(['defaulttests']), + } + } class HistogramValueChecker(object): """Verify that changes to "extension_function_histogram_value.h" are valid. diff --git a/gpu/PRESUBMIT.py b/gpu/PRESUBMIT.py index fbacccd617ac..a1d7ecff16d8 100644 --- a/gpu/PRESUBMIT.py +++ b/gpu/PRESUBMIT.py @@ -8,10 +8,12 @@ for more details about the presubmit API built into depot_tools. """ -def GetPreferredTrySlaves(project, change): - return [ - 'linux_gpu', - 'mac_gpu', - 'mac_gpu_retina', - 'win_gpu', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_gpu': set(['defaulttests']), + 'mac_gpu': set(['defaulttests']), + 'mac_gpu_retina': set(['defaulttests']), + 'win_gpu': set(['defaulttests']), + } + } diff --git a/jingle/PRESUBMIT.py b/jingle/PRESUBMIT.py index 1ed6464075e2..efbfc0c9d7be 100644 --- a/jingle/PRESUBMIT.py +++ b/jingle/PRESUBMIT.py @@ -8,9 +8,11 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return [ - 'linux_rel:sync_integration_tests', - 'mac_rel:sync_integration_tests', - 'win_rel:sync_integration_tests', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_rel': set(['sync_integration_tests']), + 'mac_rel': set(['sync_integration_tests']), + 'win_rel': set(['sync_integration_tests']), + } + } diff --git a/native_client_sdk/PRESUBMIT.py b/native_client_sdk/PRESUBMIT.py index d219be389a31..ac9fd612e53f 100644 --- a/native_client_sdk/PRESUBMIT.py +++ b/native_client_sdk/PRESUBMIT.py @@ -38,12 +38,14 @@ def CheckChangeOnCommit(input_api, output_api): return CommonChecks(input_api, output_api) -def GetPreferredTrySlaves(project, change): - return [ - 'linux_nacl_sdk', - 'linux_nacl_sdk_build', - 'win_nacl_sdk', - 'win_nacl_sdk_build', - 'mac_nacl_sdk', - 'mac_nacl_sdk_build' - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_nacl_sdk': set(['defaulttests']), + 'linux_nacl_sdk_build': set(['defaulttests']), + 'win_nacl_sdk': set(['defaulttests']), + 'win_nacl_sdk_build': set(['defaulttests']), + 'mac_nacl_sdk': set(['defaulttests']), + 'mac_nacl_sdk_build': set(['defaulttests']), + } + } diff --git a/net/PRESUBMIT.py b/net/PRESUBMIT.py index 3a2f21323b6c..4c0ac24cc11a 100644 --- a/net/PRESUBMIT.py +++ b/net/PRESUBMIT.py @@ -8,14 +8,17 @@ 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 diff --git a/skia/PRESUBMIT.py b/skia/PRESUBMIT.py index e22733cf670c..8da3859c2c6b 100644 --- a/skia/PRESUBMIT.py +++ b/skia/PRESUBMIT.py @@ -8,11 +8,13 @@ for more details about the presubmit API built into depot_tools. """ -def GetPreferredTrySlaves(project, change): - return [ - 'linux_gpu', - 'win_gpu', - 'mac_gpu', - 'mac_gpu_retina', - 'linux_layout_rel', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_gpu': set(['defaulttests']), + 'win_gpu': set(['defaulttests']), + 'mac_gpu': set(['defaulttests']), + 'mac_gpu_retina': set(['defaulttests']), + 'linux_layout_rel': set(['defaulttests']), + } + } diff --git a/sync/PRESUBMIT.py b/sync/PRESUBMIT.py index 8768cb07359c..aad404c78911 100644 --- a/sync/PRESUBMIT.py +++ b/sync/PRESUBMIT.py @@ -8,9 +8,11 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return [ - 'linux_rel:sync_integration_tests', - 'mac_rel:sync_integration_tests', - 'win_rel:sync_integration_tests', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_rel': set(['sync_integration_tests']), + 'mac_rel': set(['sync_integration_tests']), + 'win_rel': set(['sync_integration_tests']), + } + } diff --git a/third_party/tcmalloc/PRESUBMIT.py b/third_party/tcmalloc/PRESUBMIT.py index 8675618f3095..f9c2c5d24fb6 100755 --- a/third_party/tcmalloc/PRESUBMIT.py +++ b/third_party/tcmalloc/PRESUBMIT.py @@ -8,5 +8,9 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return ['linux_valgrind'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_valgrind': set(['defaulttests']), + } + } diff --git a/tools/lsan/PRESUBMIT.py b/tools/lsan/PRESUBMIT.py index 8364d2c0dbaf..cbc1da0da6d7 100644 --- a/tools/lsan/PRESUBMIT.py +++ b/tools/lsan/PRESUBMIT.py @@ -32,5 +32,9 @@ def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnCommit(input_api, output_api): return CheckChange(input_api, output_api) -def GetPreferredTrySlaves(): - return ['linux_asan'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_asan': set(['defaulttests']), + } + } diff --git a/tools/valgrind/drmemory/PRESUBMIT.py b/tools/valgrind/drmemory/PRESUBMIT.py index 11c71478b781..dfdfe781e484 100644 --- a/tools/valgrind/drmemory/PRESUBMIT.py +++ b/tools/valgrind/drmemory/PRESUBMIT.py @@ -31,5 +31,9 @@ def CheckChangeOnCommit(input_api, output_api): return CheckChange(input_api, output_api) -def GetPreferredTrySlaves(): - return ['win_drmemory'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'win_drmemory': set(['defaulttests']), + } + } diff --git a/tools/valgrind/memcheck/PRESUBMIT.py b/tools/valgrind/memcheck/PRESUBMIT.py index 512da0b34672..0eb54d874fa5 100644 --- a/tools/valgrind/memcheck/PRESUBMIT.py +++ b/tools/valgrind/memcheck/PRESUBMIT.py @@ -77,5 +77,10 @@ def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnCommit(input_api, output_api): return CheckChange(input_api, output_api) -def GetPreferredTrySlaves(): - return ['linux_valgrind', 'mac_valgrind'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_valgrind': set(['defaulttests']), + 'mac_valgrind': set(['defaulttests']), + } + } diff --git a/tools/valgrind/tsan/PRESUBMIT.py b/tools/valgrind/tsan/PRESUBMIT.py index 999dc1de7d4b..15b7e569f214 100644 --- a/tools/valgrind/tsan/PRESUBMIT.py +++ b/tools/valgrind/tsan/PRESUBMIT.py @@ -31,5 +31,9 @@ def CheckChangeOnCommit(input_api, output_api): return CheckChange(input_api, output_api) -def GetPreferredTrySlaves(): - return ['linux_tsan'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_tsan': set(['defaulttests']), + } + } diff --git a/ui/compositor/PRESUBMIT.py b/ui/compositor/PRESUBMIT.py index 8f465d0e0eef..9c2df47286a8 100644 --- a/ui/compositor/PRESUBMIT.py +++ b/ui/compositor/PRESUBMIT.py @@ -8,5 +8,9 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): - return ['linux_chromeos'] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_chromeos': set(['defaulttests']), + } + } diff --git a/ui/events/PRESUBMIT.py b/ui/events/PRESUBMIT.py index a9ce2a9c565e..880c83cb6b4b 100644 --- a/ui/events/PRESUBMIT.py +++ b/ui/events/PRESUBMIT.py @@ -8,15 +8,19 @@ for more details on the presubmit API built into gcl. """ -def GetPreferredTrySlaves(): +def GetPreferredTryMasters(project, change): tests = set(['ash_unittests', 'aura_unittests', 'events_unittests', 'keyboard_unittests', 'views_unittests']) - return [('linux_rel', tests), - ('linux_chromeos', tests), - ('linux_chromeos_asan', tests), - ('win', tests), - ('win_rel', tests)] + return { + 'tryserver.chromium': { + 'linux_rel': tests, + 'linux_chromeos': tests, + 'linux_chromeos_asan': tests, + 'win': tests, + 'win_rel': tests, + } + } diff --git a/ui/gl/PRESUBMIT.py b/ui/gl/PRESUBMIT.py index 1e529b45f029..b1fe6347b84d 100644 --- a/ui/gl/PRESUBMIT.py +++ b/ui/gl/PRESUBMIT.py @@ -8,10 +8,12 @@ for more details about the presubmit API built into depot_tools. """ -def GetPreferredTrySlaves(project, change): - return [ - 'linux_gpu', - 'mac_gpu', - 'mac_gpu_retina', - 'win_gpu', - ] +def GetPreferredTryMasters(project, change): + return { + 'tryserver.chromium': { + 'linux_gpu': set(['defaulttests']), + 'mac_gpu': set(['defaulttests']), + 'mac_gpu_retina': set(['defaulttests']), + 'win_gpu': set(['defaulttests']), + } + }