Skip to content

Commit cf552fb

Browse files
jamesrjamesr
committed
Set the default try set to 'Mojo Linux Try'
I plan to rename the try bot and add a bunch more, but for now this is the try server we have. With this 'git cl try' in the mojo repo does approximately the right thing. [email protected] Review URL: https://codereview.chromium.org/748663002
1 parent 14649f0 commit cf552fb

File tree

2 files changed

+3
-277
lines changed

2 files changed

+3
-277
lines changed

‎PRESUBMIT.py

+3-169
Original file line numberDiff line numberDiff line change
@@ -1552,69 +1552,12 @@ def CheckChangeOnUpload(input_api, output_api):
15521552
return results
15531553

15541554

1555-
def GetTryServerMasterForBot(bot):
1556-
"""Returns the Try Server master for the given bot.
1557-
1558-
It tries to guess the master from the bot name, but may still fail
1559-
and return None. There is no longer a default master.
1560-
"""
1561-
# Potentially ambiguous bot names are listed explicitly.
1562-
master_map = {
1563-
'linux_gpu': 'tryserver.chromium.gpu',
1564-
'mac_gpu': 'tryserver.chromium.gpu',
1565-
'win_gpu': 'tryserver.chromium.gpu',
1566-
'chromium_presubmit': 'tryserver.chromium.linux',
1567-
'blink_presubmit': 'tryserver.chromium.linux',
1568-
'tools_build_presubmit': 'tryserver.chromium.linux',
1569-
}
1570-
master = master_map.get(bot)
1571-
if not master:
1572-
if 'gpu' in bot:
1573-
master = 'tryserver.chromium.gpu'
1574-
elif 'linux' in bot or 'android' in bot or 'presubmit' in bot:
1575-
master = 'tryserver.chromium.linux'
1576-
elif 'win' in bot:
1577-
master = 'tryserver.chromium.win'
1578-
elif 'mac' in bot or 'ios' in bot:
1579-
master = 'tryserver.chromium.mac'
1580-
return master
1581-
1582-
15831555
def GetDefaultTryConfigs(bots=None):
15841556
"""Returns a list of ('bot', set(['tests']), optionally filtered by [bots].
15851557
1586-
To add tests to this list, they MUST be in the the corresponding master's
1587-
gatekeeper config. For example, anything on master.chromium would be closed by
1588-
tools/build/masters/master.chromium/master_gatekeeper_cfg.py.
1589-
15901558
If 'bots' is specified, will only return configurations for bots in that list.
15911559
"""
15921560

1593-
standard_tests = [
1594-
'base_unittests',
1595-
'browser_tests',
1596-
'cacheinvalidation_unittests',
1597-
'check_deps',
1598-
'check_deps2git',
1599-
'content_browsertests',
1600-
'content_unittests',
1601-
'crypto_unittests',
1602-
'gpu_unittests',
1603-
'interactive_ui_tests',
1604-
'ipc_tests',
1605-
'jingle_unittests',
1606-
'media_unittests',
1607-
'net_unittests',
1608-
'ppapi_unittests',
1609-
'printing_unittests',
1610-
'sql_unittests',
1611-
'sync_unit_tests',
1612-
'unit_tests',
1613-
# Broken in release.
1614-
#'url_unittests',
1615-
#'webkit_unit_tests',
1616-
]
1617-
16181561
builders_and_tests = {
16191562
# TODO(maruel): Figure out a way to run 'sizes' where people can
16201563
# effectively update the perf expectation correctly. This requires a
@@ -1623,51 +1566,7 @@ def GetDefaultTryConfigs(bots=None):
16231566
# http://chromium.org/developers/tree-sheriffs/perf-sheriffs.
16241567
# TODO(maruel): An option would be to run 'sizes' but not count a failure
16251568
# of this step as a try job failure.
1626-
'android_aosp': ['compile'],
1627-
'android_arm64_dbg_recipe': ['slave_steps'],
1628-
'android_chromium_gn_compile_dbg': ['compile'],
1629-
'android_chromium_gn_compile_rel': ['compile'],
1630-
'android_clang_dbg': ['slave_steps'],
1631-
'android_clang_dbg_recipe': ['slave_steps'],
1632-
'android_dbg_tests_recipe': ['slave_steps'],
1633-
'cros_x86': ['defaulttests'],
1634-
'ios_dbg_simulator': [
1635-
'compile',
1636-
'base_unittests',
1637-
'content_unittests',
1638-
'crypto_unittests',
1639-
'url_unittests',
1640-
'net_unittests',
1641-
'sql_unittests',
1642-
'ui_base_unittests',
1643-
'ui_unittests',
1644-
],
1645-
'ios_rel_device': ['compile'],
1646-
'ios_rel_device_ninja': ['compile'],
1647-
'mac_asan': ['compile'],
1648-
#TODO(stip): Change the name of this builder to reflect that it's release.
1649-
'linux_gtk': standard_tests,
1650-
'linux_chromeos_asan': ['compile'],
1651-
'linux_chromium_chromeos_clang_dbg': ['defaulttests'],
1652-
'linux_chromium_chromeos_rel_swarming': ['defaulttests'],
1653-
'linux_chromium_compile_dbg': ['defaulttests'],
1654-
'linux_chromium_gn_dbg': ['compile'],
1655-
'linux_chromium_gn_rel': ['defaulttests'],
1656-
'linux_chromium_rel_swarming': ['defaulttests'],
1657-
'linux_chromium_clang_dbg': ['defaulttests'],
1658-
'linux_gpu': ['defaulttests'],
1659-
'linux_nacl_sdk_build': ['compile'],
1660-
'mac_chromium_compile_dbg': ['defaulttests'],
1661-
'mac_chromium_rel_swarming': ['defaulttests'],
1662-
'mac_gpu': ['defaulttests'],
1663-
'mac_nacl_sdk_build': ['compile'],
1664-
'win_chromium_compile_dbg': ['defaulttests'],
1665-
'win_chromium_dbg': ['defaulttests'],
1666-
'win_chromium_rel_swarming': ['defaulttests'],
1667-
'win_chromium_x64_rel_swarming': ['defaulttests'],
1668-
'win_gpu': ['defaulttests'],
1669-
'win_nacl_sdk_build': ['compile'],
1670-
'win8_chromium_rel': ['defaulttests'],
1569+
'Mojo Linux Try': ['defaulttests'],
16711570
}
16721571

16731572
if bots:
@@ -1681,7 +1580,7 @@ def GetDefaultTryConfigs(bots=None):
16811580
# Build up the mapping from tryserver master to bot/test.
16821581
out = dict()
16831582
for bot, tests in filtered_builders_and_tests.iteritems():
1684-
out.setdefault(GetTryServerMasterForBot(bot), {})[bot] = tests
1583+
out.setdefault("tryserver.client.mojo", {})[bot] = tests
16851584
return out
16861585

16871586

@@ -1702,73 +1601,8 @@ def GetPreferredTryMasters(project, change):
17021601
if not files or all(re.search(r'[\\\/]OWNERS$', f) for f in files):
17031602
return {}
17041603

1705-
if all(re.search(r'\.(m|mm)$|(^|[\\\/_])mac[\\\/_.]', f) for f in files):
1706-
return GetDefaultTryConfigs([
1707-
'mac_chromium_compile_dbg',
1708-
'mac_chromium_rel_swarming',
1709-
])
1710-
if all(re.search('(^|[/_])win[/_.]', f) for f in files):
1711-
return GetDefaultTryConfigs([
1712-
'win_chromium_dbg',
1713-
'win_chromium_rel_swarming',
1714-
'win8_chromium_rel',
1715-
])
1716-
if all(re.search(r'(^|[\\\/_])android[\\\/_.]', f) for f in files):
1717-
return GetDefaultTryConfigs([
1718-
'android_aosp',
1719-
'android_clang_dbg',
1720-
'android_dbg_tests_recipe',
1721-
])
1722-
if all(re.search(r'[\\\/_]ios[\\\/_.]', f) for f in files):
1723-
return GetDefaultTryConfigs(['ios_rel_device', 'ios_dbg_simulator'])
1724-
17251604
builders = [
1726-
'android_arm64_dbg_recipe',
1727-
'android_chromium_gn_compile_rel',
1728-
'android_chromium_gn_compile_dbg',
1729-
'android_clang_dbg',
1730-
'android_clang_dbg_recipe',
1731-
'android_dbg_tests_recipe',
1732-
'ios_dbg_simulator',
1733-
'ios_rel_device',
1734-
'ios_rel_device_ninja',
1735-
'linux_chromium_chromeos_rel_swarming',
1736-
'linux_chromium_clang_dbg',
1737-
'linux_chromium_gn_dbg',
1738-
'linux_chromium_gn_rel',
1739-
'linux_chromium_rel_swarming',
1740-
'linux_gpu',
1741-
'mac_chromium_compile_dbg',
1742-
'mac_chromium_rel_swarming',
1743-
'mac_gpu',
1744-
'win_chromium_compile_dbg',
1745-
'win_chromium_rel_swarming',
1746-
'win_chromium_x64_rel_swarming',
1747-
'win_gpu',
1748-
'win8_chromium_rel',
1605+
'Mojo Linux Try',
17491606
]
17501607

1751-
# Match things like path/aura/file.cc and path/file_aura.cc.
1752-
# Same for chromeos.
1753-
if any(re.search(r'[\\\/_](aura|chromeos)', f) for f in files):
1754-
builders.extend([
1755-
'linux_chromeos_asan',
1756-
'linux_chromium_chromeos_clang_dbg'
1757-
])
1758-
1759-
# If there are gyp changes to base, build, or chromeos, run a full cros build
1760-
# in addition to the shorter linux_chromeos build. Changes to high level gyp
1761-
# files have a much higher chance of breaking the cros build, which is
1762-
# differnt from the linux_chromeos build that most chrome developers test
1763-
# with.
1764-
if any(re.search('^(base|build|chromeos).*\.gypi?$', f) for f in files):
1765-
builders.extend(['cros_x86'])
1766-
1767-
# The AOSP bot doesn't build the chrome/ layer, so ignore any changes to it
1768-
# unless they're .gyp(i) files as changes to those files can break the gyp
1769-
# step on that bot.
1770-
if (not all(re.search('^chrome', f) for f in files) or
1771-
any(re.search('\.gypi?$', f) for f in files)):
1772-
builders.extend(['android_aosp'])
1773-
17741608
return GetDefaultTryConfigs(builders)

‎PRESUBMIT_test.py

-108
Original file line numberDiff line numberDiff line change
@@ -541,113 +541,5 @@ def testNoEatComments(self):
541541
file_without_comments,
542542
eat_comments=False))
543543

544-
545-
class TryServerMasterTest(unittest.TestCase):
546-
def testTryServerMasters(self):
547-
bots = {
548-
'tryserver.chromium.gpu': [
549-
'mac_gpu',
550-
'mac_gpu_triggered_tests',
551-
'linux_gpu',
552-
'linux_gpu_triggered_tests',
553-
'win_gpu',
554-
'win_gpu_triggered_tests',
555-
],
556-
'tryserver.chromium.mac': [
557-
'ios_dbg_simulator',
558-
'ios_rel_device',
559-
'ios_rel_device_ninja',
560-
'mac_asan',
561-
'mac_asan_64',
562-
'mac_chromium_compile_dbg',
563-
'mac_chromium_compile_rel',
564-
'mac_chromium_dbg',
565-
'mac_chromium_rel',
566-
'mac_nacl_sdk',
567-
'mac_nacl_sdk_build',
568-
'mac_rel_naclmore',
569-
'mac_valgrind',
570-
'mac_x64_rel',
571-
'mac_xcodebuild',
572-
],
573-
'tryserver.chromium.linux': [
574-
'android_aosp',
575-
'android_chromium_gn_compile_dbg',
576-
'android_chromium_gn_compile_rel',
577-
'android_clang_dbg',
578-
'android_dbg',
579-
'android_dbg_recipe',
580-
'android_dbg_triggered_tests',
581-
'android_dbg_triggered_tests_recipe',
582-
'android_fyi_dbg',
583-
'android_fyi_dbg_triggered_tests',
584-
'android_rel',
585-
'android_rel_triggered_tests',
586-
'android_x86_dbg',
587-
'blink_android_compile_dbg',
588-
'blink_android_compile_rel',
589-
'blink_presubmit',
590-
'chromium_presubmit',
591-
'linux_arm_cross_compile',
592-
'linux_arm_tester',
593-
'linux_chromeos_asan',
594-
'linux_chromeos_browser_asan',
595-
'linux_chromeos_valgrind',
596-
'linux_chromium_chromeos_clang_dbg',
597-
'linux_chromium_chromeos_clang_rel',
598-
'linux_chromium_chromeos_dbg',
599-
'linux_chromium_chromeos_rel',
600-
'linux_chromium_clang_dbg',
601-
'linux_chromium_clang_rel',
602-
'linux_chromium_compile_dbg',
603-
'linux_chromium_compile_rel',
604-
'linux_chromium_dbg',
605-
'linux_chromium_gn_dbg',
606-
'linux_chromium_gn_rel',
607-
'linux_chromium_rel',
608-
'linux_chromium_trusty32_dbg',
609-
'linux_chromium_trusty32_rel',
610-
'linux_chromium_trusty_dbg',
611-
'linux_chromium_trusty_rel',
612-
'linux_clang_tsan',
613-
'linux_ecs_ozone',
614-
'linux_layout',
615-
'linux_layout_asan',
616-
'linux_layout_rel',
617-
'linux_layout_rel_32',
618-
'linux_nacl_sdk',
619-
'linux_nacl_sdk_bionic',
620-
'linux_nacl_sdk_bionic_build',
621-
'linux_nacl_sdk_build',
622-
'linux_redux',
623-
'linux_rel_naclmore',
624-
'linux_rel_precise32',
625-
'linux_valgrind',
626-
'tools_build_presubmit',
627-
],
628-
'tryserver.chromium.win': [
629-
'win8_aura',
630-
'win8_chromium_dbg',
631-
'win8_chromium_rel',
632-
'win_chromium_compile_dbg',
633-
'win_chromium_compile_rel',
634-
'win_chromium_dbg',
635-
'win_chromium_rel',
636-
'win_chromium_rel',
637-
'win_chromium_x64_dbg',
638-
'win_chromium_x64_rel',
639-
'win_drmemory',
640-
'win_nacl_sdk',
641-
'win_nacl_sdk_build',
642-
'win_rel_naclmore',
643-
],
644-
}
645-
for master, bots in bots.iteritems():
646-
for bot in bots:
647-
self.assertEqual(master, PRESUBMIT.GetTryServerMasterForBot(bot),
648-
'bot=%s: expected %s, computed %s' % (
649-
bot, master, PRESUBMIT.GetTryServerMasterForBot(bot)))
650-
651-
652544
if __name__ == '__main__':
653545
unittest.main()

0 commit comments

Comments
 (0)