Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(794)

Side by Side Diff: masters/master.tryserver.chromium/master.cfg

Issue 24565004: Split swarm_triggered into 3 builders to make it easier on devs. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/tools/build.git@master
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # ex: set syntax=python: 2 # ex: set syntax=python:
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # READ THIS: 7 # READ THIS:
8 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure 8 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
9 9
10 import socket 10 import socket
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 471
472 b_linux_rel = CreateBuilder( 472 b_linux_rel = CreateBuilder(
473 platform='linux', 473 platform='linux',
474 target='Release', 474 target='Release',
475 goma=True, 475 goma=True,
476 options=linux_targets, 476 options=linux_targets,
477 tests=linux_tests + ['sizes_br'], 477 tests=linux_tests + ['sizes_br'],
478 builder_name='linux_rel', 478 builder_name='linux_rel',
479 slavebuilddir='linux', 479 slavebuilddir='linux',
480 factory_properties={ 480 factory_properties={
481 'triggered_builder': 'linux_swarm_triggered',
481 'use_xvfb_on_linux': True, 482 'use_xvfb_on_linux': True,
482 }, 483 },
483 run_default_swarm_tests=[ 484 run_default_swarm_tests=[
484 'base_unittests', 485 'base_unittests',
485 'browser_tests', 486 'browser_tests',
486 'interactive_ui_tests', 487 'interactive_ui_tests',
487 'net_unittests', 488 'net_unittests',
488 'unit_tests', 489 'unit_tests',
489 ]) 490 ])
490 491
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 610
610 b_mac_rel = CreateBuilder( 611 b_mac_rel = CreateBuilder(
611 platform='mac', 612 platform='mac',
612 target='Release', 613 target='Release',
613 options=mac_targets, 614 options=mac_targets,
614 tests=mac_tests + ['sizes_br'], 615 tests=mac_tests + ['sizes_br'],
615 builder_name='mac_rel', 616 builder_name='mac_rel',
616 slavebuilddir='mac', 617 slavebuilddir='mac',
617 goma=True, 618 goma=True,
618 clang=True, 619 clang=True,
620 factory_properties={
621 'triggered_builder': 'mac_swarm_triggered',
622 },
619 run_default_swarm_tests=[ 623 run_default_swarm_tests=[
620 'base_unittests', 624 'base_unittests',
621 'browser_tests', 625 'browser_tests',
622 'interactive_ui_tests', 626 'interactive_ui_tests',
623 'net_unittests', 627 'net_unittests',
624 'unit_tests', 628 'unit_tests',
625 ]) 629 ])
626 630
627 b_mac_rel_naclmore = CreateBuilder( 631 b_mac_rel_naclmore = CreateBuilder(
628 platform='mac', 632 platform='mac',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 target='Release', 725 target='Release',
722 platform='win32', 726 platform='win32',
723 options=win_targets, 727 options=win_targets,
724 tests=win_tests + ['sizes_br'], 728 tests=win_tests + ['sizes_br'],
725 builder_name='win_rel', 729 builder_name='win_rel',
726 slavebuilddir='win', 730 slavebuilddir='win',
727 factory_properties={ 731 factory_properties={
728 'gclient_env': { 732 'gclient_env': {
729 'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1', 733 'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1',
730 }, 734 },
735 'triggered_builder': 'win_swarm_triggered',
731 }, 736 },
732 goma=True, 737 goma=True,
733 run_default_swarm_tests=[ 738 run_default_swarm_tests=[
734 'base_unittests', 739 'base_unittests',
735 'browser_tests', 740 'browser_tests',
736 'interactive_ui_tests', 741 'interactive_ui_tests',
737 'net_unittests', 742 'net_unittests',
738 'unit_tests', 743 'unit_tests',
739 ]) 744 ])
740 745
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 'chrome_frame_tests', 1600 'chrome_frame_tests',
1596 ], 1601 ],
1597 slavebuilddir='win', 1602 slavebuilddir='win',
1598 factory_properties={ 1603 factory_properties={
1599 'gclient_env': { 1604 'gclient_env': {
1600 'GYP_DEFINES': 'fastbuild=0', 1605 'GYP_DEFINES': 'fastbuild=0',
1601 }, 1606 },
1602 }) 1607 })
1603 1608
1604 # Swarm Builder 1609 # Swarm Builder
1605 b_swarm = { 1610 b_swarms = [
1611 {
1606 'auto_reboot': False, 1612 'auto_reboot': False,
1607 'factory': swarm_factory.SwarmTestBuilder( 1613 'factory': swarm_factory.SwarmTestBuilder(
1608 config.Master.swarm_server_internal_url, 1614 config.Master.swarm_server_internal_url,
1609 config.Master.swarm_hashtable_server_internal, 1615 config.Master.swarm_hashtable_server_internal,
1610 tests=[ 1616 tests=[
1611 'base_unittests', 1617 'base_unittests',
1612 'browser_tests', 1618 'browser_tests',
1613 'interactive_ui_tests', 1619 'interactive_ui_tests',
1614 'net_unittests', 1620 'net_unittests',
1615 'sync_integration_tests', 1621 'sync_integration_tests',
1616 'unit_tests', 1622 'unit_tests',
1617 ]), 1623 ]),
1618 'name': 'swarm_triggered', 1624 'name': '%s_swarm_triggered' % name,
1619 } 1625 } for name in ('linux', 'mac', 'win')
1626 ]
1620 1627
1621 # Clang builders 1628 # Clang builders
1622 b_linux_clang = CreateBuilder( 1629 b_linux_clang = CreateBuilder(
1623 platform='linux', 1630 platform='linux',
1624 target='Debug', 1631 target='Debug',
1625 options=linux_targets, 1632 options=linux_targets,
1626 tests=linux_tests, 1633 tests=linux_tests,
1627 builder_name='linux_clang', 1634 builder_name='linux_clang',
1628 goma=True, 1635 goma=True,
1629 clang=True, 1636 clang=True,
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
2199 b_linux_arm_tester, 2206 b_linux_arm_tester,
2200 b_valgrind_linux, b_valgrind_mac, 2207 b_valgrind_linux, b_valgrind_mac,
2201 b_linux_chromeos_valgrind, 2208 b_linux_chromeos_valgrind,
2202 b_tsan_linux, b_tsan_win, b_drmemory_win, 2209 b_tsan_linux, b_tsan_win, b_drmemory_win,
2203 b_linux_layout, b_mac_layout, b_win_layout, 2210 b_linux_layout, b_mac_layout, b_win_layout,
2204 b_linux_layout_rel, b_mac_layout_rel, b_win_layout_rel, 2211 b_linux_layout_rel, b_mac_layout_rel, b_win_layout_rel,
2205 b_linux_layout_asan, b_linux_layout_rel_32, 2212 b_linux_layout_asan, b_linux_layout_rel_32,
2206 b_mac_layout_rel_lion, b_mac_layout_rel_mountainlion, 2213 b_mac_layout_rel_lion, b_mac_layout_rel_mountainlion,
2207 b_coverage_linux, 2214 b_coverage_linux,
2208 b_win_chrome_frame, 2215 b_win_chrome_frame,
2209 b_swarm, 2216 ] + b_swarms + [
2210 b_linux_chromeos_clang, 2217 b_linux_chromeos_clang,
2211 b_linux_futura, b_linux_aura, b_win7_aura, b_win8_aura, 2218 b_linux_futura, b_linux_aura, b_win7_aura, b_win8_aura,
2212 b_linux_asan, b_linux_browser_asan, b_linux_clang_tsan, 2219 b_linux_asan, b_linux_browser_asan, b_linux_clang_tsan,
2213 b_linux_chromeos_asan, 2220 b_linux_chromeos_asan,
2214 b_mac_asan, b_mac_xcodebuild, 2221 b_mac_asan, b_mac_xcodebuild,
2215 b_linux_heapcheck, 2222 b_linux_heapcheck,
2216 b_linux_redux, 2223 b_linux_redux,
2217 b_cros_pfq_x86, b_cros_pfq_amd64, b_cros_pfq_daisy, 2224 b_cros_pfq_x86, b_cros_pfq_amd64, b_cros_pfq_daisy,
2218 b_linux_gpu, b_win_gpu, b_mac_gpu, b_mac_gpu_retina, 2225 b_linux_gpu, b_win_gpu, b_mac_gpu, b_mac_gpu_retina,
2219 b_linux_nacl_sdk, b_win_nacl_sdk, b_mac_nacl_sdk, 2226 b_linux_nacl_sdk, b_win_nacl_sdk, b_mac_nacl_sdk,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
2292 name='android_dbg', 2299 name='android_dbg',
2293 builderNames=['android_dbg_triggered_tests'])) 2300 builderNames=['android_dbg_triggered_tests']))
2294 c['schedulers'].append(Triggerable( 2301 c['schedulers'].append(Triggerable(
2295 name='android_rel', 2302 name='android_rel',
2296 builderNames=['android_rel_triggered_tests'])) 2303 builderNames=['android_rel_triggered_tests']))
2297 c['schedulers'].append(Triggerable( 2304 c['schedulers'].append(Triggerable(
2298 name='android_fyi_dbg', 2305 name='android_fyi_dbg',
2299 builderNames=['android_fyi_dbg_triggered_tests'])) 2306 builderNames=['android_fyi_dbg_triggered_tests']))
2300 2307
2301 # Triggerable scheduler for Swarm Tests. 2308 # Triggerable scheduler for Swarm Tests.
2302 c['schedulers'].append(Triggerable( 2309 for name in ('linux', 'mac', 'win'):
2303 name='swarm_triggered', 2310 c['schedulers'].append(Triggerable(
2304 builderNames=['swarm_triggered'])) 2311 name='%s_swarm_triggered' % name,
2312 builderNames=['%s_swarm_triggered' % name]))
2305 2313
2306 # Triggerable scheduler for linux arm 2314 # Triggerable scheduler for linux arm
2307 c['schedulers'].append(Triggerable( 2315 c['schedulers'].append(Triggerable(
2308 name='linux_arm', 2316 name='linux_arm',
2309 builderNames=['linux_arm_tester'])) 2317 builderNames=['linux_arm_tester']))
2310 2318
2311 2319
2312 ####### STATUS TARGETS 2320 ####### STATUS TARGETS
2313 2321
2314 # Adds common status and tools to this master. 2322 # Adds common status and tools to this master.
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
2388 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage' 2396 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
2389 2397
2390 # Buildbot master url: 2398 # Buildbot master url:
2391 if ActiveMaster.is_production_host: 2399 if ActiveMaster.is_production_host:
2392 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/' 2400 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
2393 else: 2401 else:
2394 c['buildbotURL'] = 'http://%s:%d/' % ( 2402 c['buildbotURL'] = 'http://%s:%d/' % (
2395 socket.getfqdn(), ActiveMaster.master_port) 2403 socket.getfqdn(), ActiveMaster.master_port)
2396 2404
2397 # vi: set ts=4 sts=2 sw=2 et: 2405 # vi: set ts=4 sts=2 sw=2 et:
OLDNEW
« no previous file with comments | « no previous file | masters/master.tryserver.chromium/slaves.cfg » ('j') | scripts/master/factory/swarm_factory.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698