Index: masters/master.tryserver.chromium/master.cfg |
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg |
index 107cbd7901a9dec437c01eebf9695b84aa78b508..1fad2e6c177abc715c1938c7f108f3e29c2d25a4 100644 |
--- a/masters/master.tryserver.chromium/master.cfg |
+++ b/masters/master.tryserver.chromium/master.cfg |
@@ -478,6 +478,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=[ |
@@ -616,6 +617,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', |
@@ -728,6 +732,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=[ |
@@ -1602,7 +1607,8 @@ b_win_chrome_frame = CreateBuilder( |
}) |
# Swarm Builder |
-b_swarm = { |
+b_swarms = [ |
+ { |
'auto_reboot': False, |
'factory': swarm_factory.SwarmTestBuilder( |
config.Master.swarm_server_internal_url, |
@@ -1615,8 +1621,9 @@ b_swarm = { |
'sync_integration_tests', |
'unit_tests', |
]), |
- 'name': 'swarm_triggered', |
-} |
+ 'name': '%s_swarm_triggered' % name, |
+ } for name in ('linux', 'mac', 'win') |
+] |
# Clang builders |
b_linux_clang = CreateBuilder( |
@@ -2206,7 +2213,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, |
@@ -2299,9 +2306,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( |