0

Update masters after the tryserver split.

Also replace deprecated linux_chromium_rel with linux_chromium_rel_swarming, while I'm at it.

R=agable@chromium.org, maruel@chromium.org
BUG=395196

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285752 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
sergeyberezin@chromium.org
2014-07-26 04:38:32 +00:00
parent a1b1459610
commit 0bb112369a
23 changed files with 198 additions and 35 deletions

@ -1418,13 +1418,29 @@ def CheckChangeOnUpload(input_api, output_api):
def GetTryServerMasterForBot(bot):
"""Returns the Try Server master for the given bot.
Assumes that most Try Servers are on the tryserver.chromium master."""
non_default_master_map = {
It tries to guess the master from the bot name, but may still fail
and return None. There is no longer a default master.
"""
# Potentially ambiguous bot names are listed explicitly.
master_map = {
'linux_gpu': 'tryserver.chromium.gpu',
'mac_gpu': 'tryserver.chromium.gpu',
'win_gpu': 'tryserver.chromium.gpu',
'chromium_presubmit': 'tryserver.chromium.linux',
'blink_presubmit': 'tryserver.chromium.linux',
'tools_build_presubmit': 'tryserver.chromium.linux',
}
return non_default_master_map.get(bot, 'tryserver.chromium')
master = master_map.get(bot)
if not master:
if 'gpu' in bot:
master = 'tryserver.chromium.gpu'
elif 'linux' in bot or 'android' in bot or 'presubmit' in bot:
master = 'tryserver.chromium.linux'
elif 'win' in bot:
master = 'tryserver.chromium.win'
elif 'mac' in bot or 'ios' in bot:
master = 'tryserver.chromium.mac'
return master
def GetDefaultTryConfigs(bots=None):
@ -1495,7 +1511,7 @@ def GetDefaultTryConfigs(bots=None):
'linux_chromium_chromeos_rel': ['defaulttests'],
'linux_chromium_compile_dbg': ['defaulttests'],
'linux_chromium_gn_rel': ['defaulttests'],
'linux_chromium_rel': ['defaulttests'],
'linux_chromium_rel_swarming': ['defaulttests'],
'linux_chromium_clang_dbg': ['defaulttests'],
'linux_gpu': ['defaulttests'],
'linux_nacl_sdk_build': ['compile'],
@ -1577,7 +1593,7 @@ def GetPreferredTryMasters(project, change):
'linux_chromium_chromeos_rel',
'linux_chromium_clang_dbg',
'linux_chromium_gn_rel',
'linux_chromium_rel',
'linux_chromium_rel_swarming',
'linux_gpu',
'mac_chromium_compile_dbg',
'mac_chromium_rel',

@ -648,5 +648,118 @@ class IDLParsingTest(unittest.TestCase):
"'%s' not found in '%s'" % (expected_error, actual_error))
class TryServerMasterTest(unittest.TestCase):
def testTryServerMasters(self):
bots = {
'tryserver.chromium.gpu': [
'mac_gpu',
'mac_gpu_triggered_tests',
'linux_gpu',
'linux_gpu_triggered_tests',
'win_gpu',
'win_gpu_triggered_tests',
],
'tryserver.chromium.mac': [
'ios_dbg_simulator',
'ios_rel_device',
'ios_rel_device_ninja',
'mac_asan',
'mac_asan_64',
'mac_chromium_compile_dbg',
'mac_chromium_compile_rel',
'mac_chromium_dbg',
'mac_chromium_rel',
'mac_chromium_rel_swarming',
'mac_nacl_sdk',
'mac_nacl_sdk_build',
'mac_rel_naclmore',
'mac_valgrind',
'mac_x64_rel',
'mac_xcodebuild',
],
'tryserver.chromium.linux': [
'android_aosp',
'android_chromium_gn_compile_dbg',
'android_chromium_gn_compile_rel',
'android_clang_dbg',
'android_dbg',
'android_dbg_recipe',
'android_dbg_triggered_tests',
'android_dbg_triggered_tests_recipe',
'android_fyi_dbg',
'android_fyi_dbg_triggered_tests',
'android_rel',
'android_rel_triggered_tests',
'android_x86_dbg',
'blink_android_compile_dbg',
'blink_android_compile_rel',
'blink_presubmit',
'chromium_presubmit',
'linux_arm_cross_compile',
'linux_arm_tester',
'linux_asan',
'linux_browser_asan',
'linux_chromeos_asan',
'linux_chromeos_browser_asan',
'linux_chromeos_valgrind',
'linux_chromium_chromeos_clang_dbg',
'linux_chromium_chromeos_clang_rel',
'linux_chromium_chromeos_dbg',
'linux_chromium_chromeos_rel',
'linux_chromium_clang_dbg',
'linux_chromium_clang_rel',
'linux_chromium_compile_dbg',
'linux_chromium_compile_rel',
'linux_chromium_dbg',
'linux_chromium_gn_dbg',
'linux_chromium_gn_rel',
'linux_chromium_rel',
'linux_chromium_rel_swarming',
'linux_chromium_trusty32_dbg',
'linux_chromium_trusty32_rel',
'linux_chromium_trusty_dbg',
'linux_chromium_trusty_rel',
'linux_clang_tsan',
'linux_ecs_ozone',
'linux_layout',
'linux_layout_asan',
'linux_layout_rel',
'linux_layout_rel_32',
'linux_nacl_sdk',
'linux_nacl_sdk_bionic',
'linux_nacl_sdk_bionic_build',
'linux_nacl_sdk_build',
'linux_redux',
'linux_rel_naclmore',
'linux_rel_precise32',
'linux_valgrind',
'tools_build_presubmit',
],
'tryserver.chromium.win': [
'win8_aura',
'win8_chromium_dbg',
'win8_chromium_rel',
'win_chromium_compile_dbg',
'win_chromium_compile_rel',
'win_chromium_dbg',
'win_chromium_rel',
'win_chromium_rel',
'win_chromium_rel_swarming',
'win_chromium_rel_swarming',
'win_chromium_x64_dbg',
'win_chromium_x64_rel',
'win_drmemory',
'win_nacl_sdk',
'win_nacl_sdk_build',
'win_rel_naclmore',
],
}
for master, bots in bots.iteritems():
for bot in bots:
self.assertEqual(master, PRESUBMIT.GetTryServerMasterForBot(bot),
'bot=%s: expected %s, computed %s' % (
bot, master, PRESUBMIT.GetTryServerMasterForBot(bot)))
if __name__ == '__main__':
unittest.main()

@ -10,7 +10,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_clang_dbg': set(['defaulttests']),
}
}

@ -50,9 +50,13 @@ def CheckChangeOnCommit(input_api, output_api):
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'linux_chromium_rel': set(['defaulttests']),
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel': set(['defaulttests']),
}
}

@ -293,7 +293,7 @@ def CheckChangeOnUpload(input_api, output_api):
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.blink': {
'linux_blink_rel': set(['defaulttests']),
},
'tryserver.chromium.gpu': {

@ -10,7 +10,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel': set(['defaulttests']),
'linux_chromium_chromeos_clang_dbg': set(['defaulttests']),
}

@ -10,9 +10,13 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'linux_chromium_rel': set(['defaulttests']),
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel': set(['defaulttests']),
}
}

@ -12,7 +12,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'linux_chromium_rel': set(['defaulttests']),
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
}
}

@ -10,7 +10,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel': set(['defaulttests']),
}
}

@ -10,7 +10,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel': set(['defaulttests']),
}
}

@ -10,9 +10,13 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'linux_chromium_rel': set(['defaulttests']),
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel': set(['defaulttests']),
}
}

@ -11,7 +11,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
# Changes in crypto often need a corresponding OpenSSL edit.
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_redux': set(['defaulttests']),
}
}

@ -12,7 +12,7 @@ import sys
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel': set(['defaulttests']),
}
}

@ -10,9 +10,13 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'linux_chromium_rel': set(['defaulttests']),
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel': set(['defaulttests']),
}
}

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

@ -10,15 +10,19 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
masters = {
'tryserver.chromium': {
'linux_chromium_rel': set(['defaulttests']),
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel': set(['defaulttests']),
}
}
# 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()):
masters['tryserver.chromium'].setdefault(
masters['tryserver.chromium.linux'].setdefault(
'linux_redux', set()).add('defaulttests')
return masters

@ -10,9 +10,13 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'linux_chromium_rel': set(['defaulttests']),
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_chromium_rel': set(['defaulttests']),
},
'tryserver.chromium.win': {
'win_chromium_rel': set(['defaulttests']),
}
}

@ -10,7 +10,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_valgrind': set(['defaulttests']),
}
}

@ -34,8 +34,10 @@ def CheckChangeOnCommit(input_api, output_api):
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_asan': set(['compile']),
},
'tryserver.chromium.mac': {
'mac_asan': set(['compile']),
}
}

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

@ -79,8 +79,10 @@ def CheckChangeOnCommit(input_api, output_api):
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_valgrind': set(['defaulttests']),
},
'tryserver.chromium.mac': {
'mac_valgrind': set(['defaulttests']),
}
}

@ -10,7 +10,7 @@ for more details on the presubmit API built into gcl.
def GetPreferredTryMasters(project, change):
return {
'tryserver.chromium': {
'tryserver.chromium.linux': {
'linux_chromium_chromeos_rel': set(['defaulttests']),
}
}

@ -16,10 +16,12 @@ def GetPreferredTryMasters(project, change):
'views_unittests'])
return {
'tryserver.chromium': {
'linux_chromium_rel': tests,
'tryserver.chromium.linux': {
'linux_chromium_rel_swarming': tests,
'linux_chromium_chromeos_rel': tests,
'linux_chromeos_asan': tests,
},
'tryserver.chromium.win': {
'win_chromium_compile_dbg': tests,
'win_chromium_rel': tests,
}