Chromium Code Reviews| Index: masters/master.tryserver.chromium/master.cfg |
| diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg |
| index 3794780aceb0fcfbc9751fee59af98c0be4b7001..e6a97124c0db14f3560e85919d9b1d8cddd1695c 100644 |
| --- a/masters/master.tryserver.chromium/master.cfg |
| +++ b/masters/master.tryserver.chromium/master.cfg |
| @@ -13,7 +13,7 @@ from buildbot.scheduler import Triggerable |
| from master import master_utils |
| from master import slaves_list |
| from master.builders_pools import BuildersPools |
| -from master.factory import chromium_factory, chromeos_factory |
| +from master.factory import chromium_factory, chromeos_factory, swarm_factory |
| from master.try_job_http import TryJobHTTP |
| from master.try_job_rietveld import TryJobRietveld |
| from master.try_job_svn import TryJobSubversion |
| @@ -77,6 +77,12 @@ m_chromium_ios = chromium_factory.ChromiumFactory( |
| target_platform='darwin', |
| ) |
| +# Swarm |
| +m_win_swarm = swarm_factory.SwarmFactory( |
| + 'src/build', |
| + target_platform='win32', |
| + full_checkout=True) |
| + |
| def NextJob(builder, requests): |
| """Always prioritize commit queue jobs over try jobs.""" |
| for req in requests: |
| @@ -999,6 +1005,39 @@ b_win_chrome_frame = CreateBuilder( |
| slavebuilddir='win', |
| extra_gyp_defines='fastbuild=0') |
| +# Win Swarm Build |
| +b_win_swarm = { |
| + 'name': 'win_swarm', |
| + 'factory': m_win_swarm.SwarmFactory( |
| + options=['--build-tool=ninja', '--compiler=goma', |
| + 'chromium_swarm_tests', '--', '-k', '0'], |
| + tests = [ |
| + # They must be in the reverse order of latency to get results, |
| + # e.g. the slowest test should be last. |
| + swarm_factory.SwarmTest('base_unittests', 1), |
| + swarm_factory.SwarmTest('net_unittests', 3), |
| + swarm_factory.SwarmTest('unit_tests', 4), |
| + swarm_factory.SwarmTest('browser_tests', 5), |
| + ], |
|
cmp
2012/08/09 19:22:02
indent here should move to be under 't' in 'tests
csharp
2012/08/09 19:36:28
Done.
|
| + factory_properties = { |
| + 'gclient_env' : { |
| + 'GYP_DEFINES': ( |
| + 'test_isolation_mode=hashtable ' |
| + 'test_isolation_outdir=' + |
| + config.Master.swarm_windows_hashtable_internal + |
| + ' disable_nacl=1' |
| + #' enable_svg=0' |
| + ' fastbuild=1' |
| + ), |
| + 'GYP_GENERATORS': 'ninja', |
| + 'GYP_MSVS_VERSION': '2010', |
| + }, |
|
cmp
2012/08/09 19:22:02
indent here should move to be under first single q
csharp
2012/08/09 19:36:28
Done.
|
| + 'data_server': config.Master.swarm_data_server_vm1_internal, |
| + 'data_dest_dir': config.Master.swarm_windows_hashtable_internal, |
| + 'swarm_server': config.Master.swarm_server_internal_url |
|
cmp
2012/08/09 19:22:02
append a ,
csharp
2012/08/09 19:36:28
Done.
|
| + }) |
|
cmp
2012/08/09 19:22:02
this should be under f in factory_properties on li
csharp
2012/08/09 19:36:28
Done.
|
| +} |
| + |
| # Clang builders |
| b_linux_clang = CreateBuilder( |
| platform='linux', |
| @@ -1409,6 +1448,7 @@ c['builders'] = [ |
| b_linux_layout_rel, b_mac_layout_rel, b_win_layout_rel, |
| b_coverage_linux, |
| b_win_chrome_frame, |
| + b_win_swarm, |
| b_mac_no_goma, b_linux_clang_no_goma, |
| b_linux_chromeos_clang, |
| b_linux_futura, b_linux_aura, b_win_ash, b_win_aura, |