chromium/src
0
Fork 0
Code Activity

PRESUBMIT: use "master." prefix in CQ_INCLUDE_TRYBOTS.

Browse Source 
R=jam@chromium.org,danakj@chromium.org,kbr@chromium.org
BUG=617627

Review-Url: https://codereview.chromium.org/2148053002
Cr-Commit-Position: refs/heads/master@{#405365}
This commit is contained in:
tandrii
2016-07-13 17:34:50 -07:00
committed by Commit bot
parent 7c6bf95770
commit e5587794fa
12 changed files with 29 additions and 27 deletions
PRESUBMIT.pyPRESUBMIT_test.py
chrome/browser/resources
PRESUBMIT.py
content
browser
frame_host
PRESUBMIT.py
test
gpu
PRESUBMIT.py
gpu
PRESUBMIT.py
native_client_sdk
PRESUBMIT.py
sandbox/win
PRESUBMIT.py
third_party/WebKit/Source/modules/webgl
PRESUBMIT.py
tools
perf
PRESUBMIT.py
valgrind
drmemory
PRESUBMIT.py
ui/webui/resources
PRESUBMIT.py

12
PRESUBMIT.py

@ -2184,19 +2184,19 @@ def GetTryServerMasterForBot(bot):
"""
# Potentially ambiguous bot names are listed explicitly.
master_map = {
'chromium_presubmit': 'tryserver.chromium.linux',
'tools_build_presubmit': 'tryserver.chromium.linux',
'chromium_presubmit': 'master.tryserver.chromium.linux',
'tools_build_presubmit': 'master.tryserver.chromium.linux',
}
master = master_map.get(bot)
if not master:
if 'android' in bot:
master = 'tryserver.chromium.android'
master = 'master.tryserver.chromium.android'
elif 'linux' in bot or 'presubmit' in bot:
master = 'tryserver.chromium.linux'
master = 'master.tryserver.chromium.linux'
elif 'win' in bot:
master = 'tryserver.chromium.win'
master = 'master.tryserver.chromium.win'
elif 'mac' in bot or 'ios' in bot:
master = 'tryserver.chromium.mac'
master = 'master.tryserver.chromium.mac'
return master

8
PRESUBMIT_test.py

@ -706,7 +706,7 @@ class IDLParsingTest(unittest.TestCase):
class TryServerMasterTest(unittest.TestCase):
def testTryServerMasters(self):
bots = {
'tryserver.chromium.android': [
'master.tryserver.chromium.android': [
'android_archive_rel_ng',
'android_arm64_dbg_recipe',
'android_blink_rel',
@ -730,7 +730,7 @@ class TryServerMasterTest(unittest.TestCase):
'linux_android_dbg_ng',
'linux_android_rel_ng',
],
'tryserver.chromium.mac': [
'master.tryserver.chromium.mac': [
'ios_dbg_simulator',
'ios_rel_device',
'ios_rel_device_ninja',
@ -746,7 +746,7 @@ class TryServerMasterTest(unittest.TestCase):
'mac_x64_rel',
'mac_xcodebuild',
],
'tryserver.chromium.linux': [
'master.tryserver.chromium.linux': [
'chromium_presubmit',
'linux_arm_cross_compile',
'linux_arm_tester',
@ -781,7 +781,7 @@ class TryServerMasterTest(unittest.TestCase):
'linux_valgrind',
'tools_build_presubmit',
],
'tryserver.chromium.win': [
'master.tryserver.chromium.win': [
'win8_aura',
'win8_chromium_dbg',
'win8_chromium_rel',

3
chrome/browser/resources/PRESUBMIT.py

@ -105,7 +105,8 @@ def PostUploadHook(cl, change, output_api):
existing_bots = (change.CQ_INCLUDE_TRYBOTS or '').split(';')
clean_bots = set(filter(None, map(lambda s: s.strip(), existing_bots)))
new_bots = clean_bots | set(['tryserver.chromium.linux:closure_compilation'])
new_bots = clean_bots | set(
['master.tryserver.chromium.linux:closure_compilation'])
new_tag = 'CQ_INCLUDE_TRYBOTS=%s' % ';'.join(new_bots)
if clean_bots:

2
content/browser/frame_host/PRESUBMIT.py

@ -12,7 +12,7 @@ import re
def _GetTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'master.tryserver.chromium.linux': {
'linux_site_isolation': [],
},
}

6
content/test/gpu/PRESUBMIT.py

@ -73,9 +73,9 @@ def PostUploadHook(cl, change, output_api):
return []
bots = [
'tryserver.chromium.linux:linux_optional_gpu_tests_rel',
'tryserver.chromium.mac:mac_optional_gpu_tests_rel',
'tryserver.chromium.win:win_optional_gpu_tests_rel',
'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel',
'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel',
'master.tryserver.chromium.win:win_optional_gpu_tests_rel',
]
results = []

6
gpu/PRESUBMIT.py

@ -23,9 +23,9 @@ def PostUploadHook(cl, change, output_api):
return []
bots = [
'tryserver.chromium.linux:linux_optional_gpu_tests_rel',
'tryserver.chromium.mac:mac_optional_gpu_tests_rel',
'tryserver.chromium.win:win_optional_gpu_tests_rel',
'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel',
'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel',
'master.tryserver.chromium.win:win_optional_gpu_tests_rel',
]
results = []

6
native_client_sdk/PRESUBMIT.py

@ -41,15 +41,15 @@ def CheckChangeOnCommit(input_api, output_api):
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.linux': {
'master.tryserver.chromium.linux': {
'linux_nacl_sdk': set(['defaulttests']),
'linux_nacl_sdk_build': set(['defaulttests']),
},
'tryserver.chromium.win': {
'master.ryserver.chromium.win': {
'win_nacl_sdk': set(['defaulttests']),
'win_nacl_sdk_build': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'master.tryserver.chromium.mac': {
'mac_nacl_sdk': set(['defaulttests']),
'mac_nacl_sdk_build': set(['defaulttests']),
}

2
sandbox/win/PRESUBMIT.py

@ -23,7 +23,7 @@ def PostUploadHook(cl, change, output_api):
return []
bots = [
'tryserver.chromium.win:win10_chromium_x64_rel_ng',
'master.tryserver.chromium.win:win10_chromium_x64_rel_ng',
]
results = []

4
third_party/WebKit/Source/modules/webgl/PRESUBMIT.py vendored

@ -25,8 +25,8 @@ def PostUploadHook(cl, change, output_api):
return []
bots = [
'tryserver.chromium.win:win_optional_gpu_tests_rel',
'tryserver.chromium.mac:mac_optional_gpu_tests_rel',
'master.tryserver.chromium.win:win_optional_gpu_tests_rel',
'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel',
]
results = []

2
tools/perf/PRESUBMIT.py

@ -131,7 +131,7 @@ def PostUploadHook(cl, change, output_api):
# TODO(prasadv): Uncomment this once crbug.com/601699 is fixed.
# 'linux_perf_cq'
]
bots = ['tryserver.chromium.perf:%s' % s for s in bots]
bots = ['master.tryserver.chromium.perf:%s' % s for s in bots]
bots_string = ';'.join(bots)
description = original_description
description += '\nCQ_INCLUDE_TRYBOTS=%s' % bots_string

2
tools/valgrind/drmemory/PRESUBMIT.py

@ -33,7 +33,7 @@ def CheckChangeOnCommit(input_api, output_api):
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium.win': {
'master.tryserver.chromium.win': {
'win_drmemory': set(['defaulttests']),
}
}

3
ui/webui/resources/PRESUBMIT.py

@ -11,7 +11,8 @@ def PostUploadHook(cl, change, output_api):
existing_bots = (change.CQ_INCLUDE_TRYBOTS or '').split(';')
clean_bots = set(filter(None, map(lambda s: s.strip(), existing_bots)))
new_bots = clean_bots | set(['tryserver.chromium.linux:closure_compilation'])
new_bots = clean_bots | set(
['master.tryserver.chromium.linux:closure_compilation'])
new_tag = 'CQ_INCLUDE_TRYBOTS=%s' % ';'.join(new_bots)
if clean_bots: