| Index: masters/master.tryserver.chromium/master.cfg
|
| diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
|
| index a064e575e8e5c6e05c33b2b569cef414ba27f619..61f331d7cac916c7834496f849c6717bed911a16 100644
|
| --- a/masters/master.tryserver.chromium/master.cfg
|
| +++ b/masters/master.tryserver.chromium/master.cfg
|
| @@ -481,6 +481,7 @@ b_linux_rel = CreateBuilder(
|
| builder_name='linux_rel',
|
| slavebuilddir='linux',
|
| factory_properties={
|
| + 'triggered_builder': 'linux_swarm_triggered',
|
| 'use_xvfb_on_linux': True,
|
| },
|
| run_default_swarm_tests=[
|
| @@ -620,6 +621,9 @@ b_mac_rel = CreateBuilder(
|
| slavebuilddir='mac',
|
| goma=True,
|
| clang=True,
|
| + factory_properties={
|
| + 'triggered_builder': 'mac_swarm_triggered',
|
| + },
|
| run_default_swarm_tests=[
|
| 'base_unittests',
|
| 'browser_tests',
|
| @@ -734,6 +738,7 @@ b_win_rel = CreateBuilder(
|
| 'gclient_env': {
|
| 'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1',
|
| },
|
| + 'triggered_builder': 'win_swarm_triggered',
|
| },
|
| goma=True,
|
| run_default_swarm_tests=[
|
| @@ -1611,7 +1616,26 @@ b_win_chrome_frame = CreateBuilder(
|
| })
|
|
|
| # Swarm Builder
|
| -b_swarm = {
|
| +b_swarms = [
|
| + {
|
| + 'auto_reboot': False,
|
| + 'factory': swarm_factory.SwarmTestBuilder(
|
| + config.Master.swarm_server_internal_url,
|
| + config.Master.swarm_hashtable_server_internal,
|
| + tests=[
|
| + 'base_unittests',
|
| + 'browser_tests',
|
| + 'interactive_ui_tests',
|
| + 'net_unittests',
|
| + 'sync_integration_tests',
|
| + 'unit_tests',
|
| + ]),
|
| + 'name': '%s_swarm_triggered' % name,
|
| + } for name in ('linux', 'mac', 'win')
|
| +] + [
|
| + # TODO(maruel): Temporary to ease the transition; to be deleted around
|
| + # 2013-10-28.
|
| + {
|
| 'auto_reboot': False,
|
| 'factory': swarm_factory.SwarmTestBuilder(
|
| config.Master.swarm_server_internal_url,
|
| @@ -1625,7 +1649,9 @@ b_swarm = {
|
| 'unit_tests',
|
| ]),
|
| 'name': 'swarm_triggered',
|
| -}
|
| + }
|
| +]
|
| +
|
|
|
| # Clang builders
|
| b_linux_clang = CreateBuilder(
|
| @@ -2170,7 +2196,7 @@ c['builders'] = [
|
| b_mac_layout_rel_lion, b_mac_layout_rel_mountainlion,
|
| b_coverage_linux,
|
| b_win_chrome_frame,
|
| - b_swarm,
|
| +] + b_swarms + [
|
| b_linux_chromeos_clang,
|
| b_linux_futura, b_linux_aura, b_win7_aura, b_win8_aura,
|
| b_linux_asan, b_linux_browser_asan, b_linux_clang_tsan,
|
| @@ -2263,9 +2289,10 @@ c['schedulers'].append(Triggerable(
|
| builderNames=['android_fyi_dbg_triggered_tests']))
|
|
|
| # Triggerable scheduler for Swarm Tests.
|
| -c['schedulers'].append(Triggerable(
|
| - name='swarm_triggered',
|
| - builderNames=['swarm_triggered']))
|
| +for name in ('linux', 'mac', 'win'):
|
| + c['schedulers'].append(Triggerable(
|
| + name='%s_swarm_triggered' % name,
|
| + builderNames=['%s_swarm_triggered' % name]))
|
|
|
| # Triggerable scheduler for linux arm
|
| c['schedulers'].append(Triggerable(
|
|
|