| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from buildbot.scheduler import Triggerable | 5 from buildbot.scheduler import Triggerable |
| 6 from buildbot.scheduler import Scheduler | 6 from buildbot.scheduler import Scheduler |
| 7 | 7 |
| 8 from common import chromium_utils | 8 from common import chromium_utils |
| 9 | 9 |
| 10 # These modules come from scripts/master, which must be in the PYTHONPATH. | 10 # These modules come from scripts/master, which must be in the PYTHONPATH. |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 | 36 |
| 37 ####### SCHEDULERS | 37 ####### SCHEDULERS |
| 38 | 38 |
| 39 ## configure the Schedulers | 39 ## configure the Schedulers |
| 40 | 40 |
| 41 # Main scheduler for all changes in trunk. | 41 # Main scheduler for all changes in trunk. |
| 42 s_chromium = Scheduler(name='chromium', | 42 s_chromium = Scheduler(name='chromium', |
| 43 branch='master', | 43 branch='master', |
| 44 treeStableTimer=60, | 44 treeStableTimer=60, |
| 45 builderNames=[# BuildTesters: | 45 builderNames=[# Builders |
| 46 'Webkit Linux (valgrind layout)', | |
| 47 | |
| 48 # Builders | |
| 49 'Chromium Windows Builder (DrMemory)', | 46 'Chromium Windows Builder (DrMemory)', |
| 50 'Chromium Windows Builder (DrMemory x64)', | 47 'Chromium Windows Builder (DrMemory x64)', |
| 51 'Chromium Linux Builder (valgrind)', | 48 'Chromium Linux Builder (valgrind)', |
| 52 'Chromium Mac Builder (valgrind)', | 49 'Chromium Mac Builder (valgrind)', |
| 53 'Chromium OS Builder (valgrind)', | 50 'Chromium OS Builder (valgrind)', |
| 54 'Chromium Linux TSan Builder', | 51 'Chromium Linux TSan Builder', |
| 55 'Chromium Linux MSan Builder', | 52 'Chromium Linux MSan Builder', |
| 56 'Chromium Linux ChromeOS MSan Builder', | 53 'Chromium Linux ChromeOS MSan Builder', |
| 57 ]) | 54 ]) |
| 58 | 55 |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 f_chromium_rel_chromeos_valgrind_tests_6 = F_CR_OS( | 375 f_chromium_rel_chromeos_valgrind_tests_6 = F_CR_OS( |
| 379 target='Release', | 376 target='Release', |
| 380 slave_type='Tester', | 377 slave_type='Tester', |
| 381 build_url=chromium_chromeos_valgrind_archive, | 378 build_url=chromium_chromeos_valgrind_archive, |
| 382 tests=['valgrind_components', # Medium tests, < 10 minutes. | 379 tests=['valgrind_components', # Medium tests, < 10 minutes. |
| 383 'valgrind_sandbox', | 380 'valgrind_sandbox', |
| 384 'valgrind_unit_3_of_3', # Large tests, >= 10 minute. | 381 'valgrind_unit_3_of_3', # Large tests, >= 10 minute. |
| 385 ], | 382 ], |
| 386 factory_properties={ 'needs_valgrind' : True, 'chromeos': True }) | 383 factory_properties={ 'needs_valgrind' : True, 'chromeos': True }) |
| 387 | 384 |
| 388 f_webkit_rel_linux_valgrind_layout = F_LINUX( | |
| 389 target='Release', | |
| 390 tests=['valgrind_webkit'], | |
| 391 options=['blink_tests'], | |
| 392 factory_properties={ | |
| 393 'needs_valgrind' : True, | |
| 394 'gclient_env': { 'GYP_DEFINES' : 'build_for_tool=memcheck'}}) | |
| 395 | |
| 396 # ThreadSanitizer bots: | 385 # ThreadSanitizer bots: |
| 397 # Dr.Memory bots: | 386 # Dr.Memory bots: |
| 398 f_chromium_rel_win_drmemory_builder = F_WIN_NINJA( | 387 f_chromium_rel_win_drmemory_builder = F_WIN_NINJA( |
| 399 # TODO(timurrrr): reuse the builder for TSan/Win too once | 388 # TODO(timurrrr): reuse the builder for TSan/Win too once |
| 400 # http://crbug.com/108155 is resolved. | 389 # http://crbug.com/108155 is resolved. |
| 401 slave_type='Builder', | 390 slave_type='Builder', |
| 402 target='Release', | 391 target='Release', |
| 403 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is | 392 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is |
| 404 # not limited to just Debug. | 393 # not limited to just Debug. |
| 405 # TODO(timurrrr): Might wanna remove chromium_builder_dbg_drmemory_win | 394 # TODO(timurrrr): Might wanna remove chromium_builder_dbg_drmemory_win |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 850 } | 839 } |
| 851 | 840 |
| 852 b_chromium_rel_chromeos_valgrind_6 = { | 841 b_chromium_rel_chromeos_valgrind_6 = { |
| 853 'name': 'Chromium OS (valgrind)(6)', | 842 'name': 'Chromium OS (valgrind)(6)', |
| 854 'builddir': 'chromium-rel-chromeos-valgrind-tests-6', | 843 'builddir': 'chromium-rel-chromeos-valgrind-tests-6', |
| 855 'factory': f_chromium_rel_chromeos_valgrind_tests_6, | 844 'factory': f_chromium_rel_chromeos_valgrind_tests_6, |
| 856 'category': '3ChromeOS Valgrind|compile|memory_tester', | 845 'category': '3ChromeOS Valgrind|compile|memory_tester', |
| 857 'auto_reboot': True, | 846 'auto_reboot': True, |
| 858 } | 847 } |
| 859 | 848 |
| 860 b_webkit_rel_linux_valgrind_layout = { | |
| 861 'name': 'Webkit Linux (valgrind layout)', | |
| 862 'builddir': 'webkit-rel-linux-valgrind-layout', | |
| 863 'factory': f_webkit_rel_linux_valgrind_layout, | |
| 864 'category': '4WebKit Valgrind|compile|memory_tester', | |
| 865 'auto_reboot': True, | |
| 866 } | |
| 867 | |
| 868 b_chromium_rel_win_drmemory_builder = { | 849 b_chromium_rel_win_drmemory_builder = { |
| 869 'name': 'Chromium Windows Builder (DrMemory)', | 850 'name': 'Chromium Windows Builder (DrMemory)', |
| 870 # make the dir short for ninja build | 851 # make the dir short for ninja build |
| 871 'builddir': 'drm-cr', | 852 'builddir': 'drm-cr', |
| 872 'factory': f_chromium_rel_win_drmemory_builder, | 853 'factory': f_chromium_rel_win_drmemory_builder, |
| 873 'category': '6DrMemory Light|compile', | 854 'category': '6DrMemory Light|compile', |
| 874 'auto_reboot': True, | 855 'auto_reboot': True, |
| 875 } | 856 } |
| 876 | 857 |
| 877 b_chromium_rel_win_drmemory = { | 858 b_chromium_rel_win_drmemory = { |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1004 b_chromium_dbg_mac_valgrind_1, | 985 b_chromium_dbg_mac_valgrind_1, |
| 1005 b_chromium_dbg_mac_valgrind_2, | 986 b_chromium_dbg_mac_valgrind_2, |
| 1006 | 987 |
| 1007 b_chromium_rel_chromeos_valgrind_builder, | 988 b_chromium_rel_chromeos_valgrind_builder, |
| 1008 b_chromium_rel_chromeos_valgrind_1, | 989 b_chromium_rel_chromeos_valgrind_1, |
| 1009 b_chromium_rel_chromeos_valgrind_2, | 990 b_chromium_rel_chromeos_valgrind_2, |
| 1010 b_chromium_rel_chromeos_valgrind_3, | 991 b_chromium_rel_chromeos_valgrind_3, |
| 1011 b_chromium_rel_chromeos_valgrind_4, | 992 b_chromium_rel_chromeos_valgrind_4, |
| 1012 b_chromium_rel_chromeos_valgrind_5, | 993 b_chromium_rel_chromeos_valgrind_5, |
| 1013 b_chromium_rel_chromeos_valgrind_6, | 994 b_chromium_rel_chromeos_valgrind_6, |
| 1014 | |
| 1015 b_webkit_rel_linux_valgrind_layout, | |
| 1016 ] | 995 ] |
| 1017 | 996 |
| 1018 # DrMemory test bots | 997 # DrMemory test bots |
| 1019 b_win_drmemory = [ | 998 b_win_drmemory = [ |
| 1020 b_chromium_rel_win_drmemory_builder, | 999 b_chromium_rel_win_drmemory_builder, |
| 1021 b_chromium_rel_win_drmemory, | 1000 b_chromium_rel_win_drmemory, |
| 1022 b_chromium_rel_win_drmemory_content, | 1001 b_chromium_rel_win_drmemory_content, |
| 1023 b_chromium_rel_win_drmemory_full_1, | 1002 b_chromium_rel_win_drmemory_full_1, |
| 1024 b_chromium_rel_win_drmemory_full_2, | 1003 b_chromium_rel_win_drmemory_full_2, |
| 1025 b_chromium_rel_win_drmemory_full_3, | 1004 b_chromium_rel_win_drmemory_full_3, |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1123 # Adds common status and tools to this master. | 1102 # Adds common status and tools to this master. |
| 1124 master_utils.AutoSetupMaster(c, ActiveMaster, | 1103 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 1125 public_html='../master.chromium/public_html', | 1104 public_html='../master.chromium/public_html', |
| 1126 templates=['../master.chromium/templates'], | 1105 templates=['../master.chromium/templates'], |
| 1127 tagComparator=master_poller.comparator, | 1106 tagComparator=master_poller.comparator, |
| 1128 enable_http_status_push=ActiveMaster.is_production_host) | 1107 enable_http_status_push=ActiveMaster.is_production_host) |
| 1129 | 1108 |
| 1130 if ActiveMaster.is_production_host: | 1109 if ActiveMaster.is_production_host: |
| 1131 import notifier_cfg | 1110 import notifier_cfg |
| 1132 notifier_cfg.Update(config, ActiveMaster, c) | 1111 notifier_cfg.Update(config, ActiveMaster, c) |
| OLD | NEW |