Chromium Code Reviews| Index: masters/master.chromium.fyi/master.cfg |
| diff --git a/masters/master.chromium.fyi/master.cfg b/masters/master.chromium.fyi/master.cfg |
| index e02d19dcc726eef657ffd2ae2195b9299a454d7b..b07a64e9b4ea3ec1ee7f09fc090356bcfd7ee66a 100644 |
| --- a/masters/master.chromium.fyi/master.cfg |
| +++ b/masters/master.chromium.fyi/master.cfg |
| @@ -34,6 +34,7 @@ import master_win_drmemory_cfg |
| ActiveMaster = master_site_config.ChromiumFYI |
| DRMEMORY_NOTIFIER = True |
| + |
| STATUS_PUSH = False |
| # This is the dictionary that the buildmaster pays attention to. We also use |
| @@ -64,9 +65,7 @@ s_chromium = Scheduler( |
| name='chromium', |
| treeStableTimer=60, |
| change_filter=ChangeFilter(project='chromium', branch='master'), |
| - builderNames=['Chromium Builder', |
| - 'Chromium Windows Analyze', |
| - 'Chromium Builder (dbg)', |
| + builderNames=['Chromium Windows Analyze', |
| # The bots need a short name to work around crbug.com/399990. |
| 'CrWinGoma', |
| 'CrWinGoma(dll)', # not (shared) cause crbug.com/399990 |
| @@ -103,11 +102,9 @@ s_chromium = Scheduler( |
| 'ClangToTWin64(dbg)', |
| 'ClangToTWin64(dll)', # not (shared) cause crbug.com/399990 |
| 'CrWinAsan(dll)', # not (asan/shared) cause crbug.com/399990 |
| - 'Chromium Win x64 Clobber', |
|
scottmg
2016/04/21 22:04:51
Maybe leave the ones that are moving until they're
|
| 'Chromium Win PGO Builder', |
| 'Chromium Win x64 PGO Builder', |
| 'Blink Linux LSan ASan', |
| - 'Windows Builder (DrMemory)', |
| 'Android Builder (dbg)', |
| 'Android Asan Builder Tests (dbg)', |
| 'Android Cloud Tests', |
| @@ -125,9 +122,7 @@ s_chromium = Scheduler( |
| 'Chromium Mac 10.10 MacViews', |
| 'Chromium Mac 10.11', |
| 'Chromium Mac 10.11 Force Mac Toolchain', |
| - 'Windows 8 App Certification', |
| 'ChromiumOS Linux Tests', |
| - 'Ozone ECS Linux', |
| 'Linux ARM', |
| 'Linux Trusty', |
| 'Linux Trusty (dbg)', |
| @@ -155,19 +150,6 @@ s_chromium = Scheduler( |
| 'Linux Kitchen (annotated_run)', |
| ]) |
| -# Triggerable scheduler for Windows Release. |
| -s_chromium_win_rel = Triggerable( |
| - name='win_rel', |
| - builderNames=['Chromium Win MiniInstaller Tests', |
| - 'Win8 Tests (1)', |
| - 'Win8 Tests (2)',]) |
| - |
| -# Triggerable scheduler for Windows Debug. |
| -s_chromium_win_dbg = Triggerable( |
| - name='win_dbg', |
| - builderNames=['Vista Tests (dbg)(1)', |
| - 'Vista Tests (dbg)(2)',]) |
| - |
| # Triggerable scheduler for Android Builder |
| s_chromium_android_dbg = Triggerable( |
| name='android_dbg', |
| @@ -176,20 +158,6 @@ s_chromium_android_dbg = Triggerable( |
| 'Android Tests (x86 emulator)', |
| 'Android Remoting Tests',]) |
| -# Windows Dr. Memory build-bot list |
| -t_drmemory_bots=[ |
| - 'Windows Tests (DrMemory)', |
| - ] |
| - |
| -# Windows Browser (DrMemory light) |
| -WINDOWS_BROWSER_DRMEMORY_LIGHT_TESTERS = 2 |
| -for i in range(WINDOWS_BROWSER_DRMEMORY_LIGHT_TESTERS): |
| - t_drmemory_bots.append('Windows Browser (DrMemory light) (%d)' % (i+1)) |
| - |
| -s_chromium_windows_drmemory_trigger = Triggerable( |
| - name='chromium_windows_drmemory', |
| - builderNames=t_drmemory_bots) |
| - |
| # Triggerable schedulers for clang/win bots |
| s_win_clang = Triggerable( |
| name='cr_win_clang', builderNames=['CrWinClang tester']) |
| @@ -249,9 +217,6 @@ s_clang_tot_win64_dll = Triggerable( |
| c['schedulers'] = [s_chromium, |
| s_chromium_android_dbg, |
| - s_chromium_win_rel, |
| - s_chromium_win_dbg, |
| - s_chromium_windows_drmemory_trigger, |
| s_win_clang, |
| s_win_clang_dbg, |
| s_win_clang_shared, |
| @@ -296,18 +261,6 @@ builders = [] |
| # ---------------------------------------------------------------------------- |
| # FACTORIES |
| -F_RECIPE = annotator_factory.AnnotatorFactory().BaseFactory( |
| - recipe='chromium.fyi.win_block.recipe_autogen') |
| - |
| -F_RECIPE_WDM = annotator_factory.AnnotatorFactory().BaseFactory( |
| - recipe='chromium.fyi.drmemory_win_block.recipe_autogen') |
| - |
| -F_RECIPE_WDBG = annotator_factory.AnnotatorFactory().BaseFactory( |
| - recipe='chromium.fyi.debug_win_block.recipe_autogen') |
| - |
| -F_RECIPE_WMISC = annotator_factory.AnnotatorFactory().BaseFactory( |
| - recipe='chromium.fyi.win_misc_block.recipe_autogen') |
| - |
| F_RECIPE_MISC = annotator_factory.AnnotatorFactory().BaseFactory( |
| recipe='chromium.fyi.misc_block.recipe_autogen') |
| @@ -446,19 +399,6 @@ b_chromium_win_analyze = {'name': 'Chromium Windows Analyze', |
| 'auto_reboot': False, |
| } |
| -b_chromium_rel_builder = {'name': 'Chromium Builder', |
| - 'builddir': 'chromium-rel-builder', |
| - 'factory': F_RECIPE, |
| - 'category': 'windows', |
| - 'auto_reboot': False, |
| -} |
| - |
| -b_chromium_dbg_builder = {'name': 'Chromium Builder (dbg)', |
| - 'builddir': 'chromium-dbg-builder', |
| - 'factory': F_RECIPE_WDBG, |
| - 'category': 'windows', |
| - 'auto_reboot': False, |
| -} |
| b_chromium_win_pgo_builder = { |
| 'name': 'Chromium Win PGO Builder', |
| @@ -476,34 +416,6 @@ b_chromium_win_x64_pgo_builder = { |
| 'auto_reboot': False, |
| } |
| -b_chromium_dbg_vista_tests_1 = { |
| - 'name': 'Vista Tests (dbg)(1)', |
| - 'factory': F_RECIPE_WDBG, |
| - 'category': 'windows', |
| - 'auto_reboot': False, |
| -} |
| - |
| -b_chromium_dbg_vista_tests_2 = { |
| - 'name': 'Vista Tests (dbg)(2)', |
| - 'factory': F_RECIPE_WDBG, |
| - 'category': 'windows', |
| - 'auto_reboot': False, |
| -} |
| - |
| -b_chromium_rel_win8_tests_1 = { |
| - 'name': 'Win8 Tests (1)', |
| - 'factory': F_RECIPE, |
| - 'category': 'windows', |
| - 'auto_reboot': False, |
| -} |
| - |
| -b_chromium_rel_win8_tests_2 = { |
| - 'name': 'Win8 Tests (2)', |
| - 'factory': F_RECIPE, |
| - 'category': 'windows', |
| - 'auto_reboot': False, |
| -} |
| - |
| b_blink_linux_lsan_asan = { |
| 'name': 'Blink Linux LSan ASan', |
| 'builddir': 'blink-linux-lsan-asan', |
| @@ -561,13 +473,6 @@ b_chromium_win_clang_goma = { |
| 'auto_reboot': False, |
| } |
| -b_chromium_win_x64 = { |
| - 'name': 'Chromium Win x64 Clobber', |
| - 'factory': F_RECIPE_WMISC, |
| - 'category': 'windows', |
| - 'auto_reboot': False, |
| -} |
| - |
| b_chromium_win_clang = { |
| 'name': 'CrWinClang', |
| 'factory': m_annotator.BaseFactory('chromium', triggers=['cr_win_clang']), |
| @@ -928,13 +833,6 @@ b_clang_tot_win64_dll_tester = { |
| 'auto_reboot': False, |
| } |
| -b_chromium_win_mini_installer = { |
| - 'name': 'Chromium Win MiniInstaller Tests', |
| - 'factory': F_RECIPE, |
| - 'category': 'windows', |
| - 'auto_reboot': False, |
| -} |
| - |
| b_chromium_dbg_android_builder = { |
| 'name': 'Android Builder (dbg)', |
| 'factory': m_annotator.BaseFactory(recipe='chromium', |
| @@ -1080,12 +978,6 @@ b_chromium_mac_1011_force_mac_toolchain = { |
| 'auto_reboot': True, |
| } |
| -b_windows_8_app_certification = { |
| - 'name': 'Windows 8 App Certification', |
| - 'factory': F_RECIPE_WMISC, |
| - 'category': 'windows', |
| -} |
| - |
| b_linux_arm = { |
| 'name': 'Linux ARM', |
| 'factory': annotator_factory.AnnotatorFactory().BaseFactory('chromium'), |
| @@ -1100,14 +992,6 @@ b_chromiumos_linux_tests = { |
| 'auto_reboot': False, |
| } |
| -b_chromium_ozone_tests = { |
| - 'name': 'Ozone ECS Linux', |
| - 'builddir': 'ozone-linux', |
| - 'factory': annotator_factory.AnnotatorFactory().BaseFactory('ozone_ecs', |
| - {'use_mirror': ActiveMaster.is_production_host or None}), |
| - 'auto_reboot': False, |
| -} |
| - |
| b_chromium_trusty = { |
| 'name': 'Linux Trusty', |
| 'factory': annotator_factory.AnnotatorFactory().BaseFactory('chromium'), |
| @@ -1142,22 +1026,6 @@ b_headless_linux = { |
| 'category': 'linux', |
| } |
| -b_chromium_windows_drmemory_builder = { |
| - 'name': 'Windows Builder (DrMemory)', |
| - 'builddir': 'drm-cr', |
| - 'factory': F_RECIPE_WDM, |
| - 'category': 'drmemory', |
| - 'auto_reboot': False, |
| -} |
| - |
| -b_chromium_tests_drmemory = { |
| - 'name': 'Windows Tests (DrMemory)', |
| - 'builddir': 'windows-tests-drm', |
| - 'factory': F_RECIPE_WDM, |
| - 'category': 'drmemory', |
| - 'auto_reboot': True, |
| -} |
| - |
| b_chromium_site_isolation_linux = { |
| 'name': 'Site Isolation Linux', |
| 'factory': annotator_factory.AnnotatorFactory().BaseFactory('chromium'), |
| @@ -1286,20 +1154,8 @@ b_chromium_libfuzzer_upload_linux_ubsan = { |
| 'auto_reboot': True, |
| } |
| -def windows_browser_drmemory_light_tester(shard, total): |
| - if shard < 1 or shard > total: |
| - raise |
| - ret = {'category': 'drmemory'} |
| - ret['name'] = 'Windows Browser (DrMemory light) (%d)' % shard |
| - ret['builddir'] = 'windows-browser-drm-light-%d' % shard |
| - ret['factory'] = F_RECIPE_WDM |
| - return ret |
| - |
| c['builders'] = [ |
| # Windows release |
| - b_chromium_rel_builder, |
| - b_chromium_rel_win8_tests_1, |
| - b_chromium_rel_win8_tests_2, |
| b_chromium_win_goma, |
| b_chromium_win_goma_shared, |
| b_chromium_win7_goma, |
| @@ -1307,8 +1163,6 @@ c['builders'] = [ |
| b_chromium_win7_goma_dbg, |
| b_chromium_win7_goma_clobber, |
| b_chromium_win_clang_goma, |
| - b_windows_8_app_certification, |
| - b_chromium_win_x64, |
| b_chromium_win_clang, |
| b_chromium_win_clang_tester, |
| b_chromium_win_clang_dbg, |
| @@ -1324,11 +1178,6 @@ c['builders'] = [ |
| b_chromium_win_pgo_builder, |
| b_chromium_win_x64_pgo_builder, |
| - # Windows debug |
| - b_chromium_dbg_builder, |
| - b_chromium_dbg_vista_tests_1, |
| - b_chromium_dbg_vista_tests_2, |
| - |
| # Mac BuilderTesters |
| b_chromium_mac_106_goma_canary, |
| b_chromium_mac_107_goma_canary, |
| @@ -1372,12 +1221,6 @@ c['builders'] = [ |
| b_chromium_libfuzzer_upload_linux_msan, |
| b_chromium_libfuzzer_upload_linux_ubsan, |
| - # MiniInstaller |
| - b_chromium_win_mini_installer, |
| - |
| - # Ozone Shell |
| - b_chromium_ozone_tests, |
| - |
| # Ubuntu 14.04 Trusty |
| b_chromium_trusty, |
| b_chromium_trusty_dbg, |
| @@ -1463,20 +1306,6 @@ c['builders'] = [ |
| b_chromium_linux_webkit_trace_wrappables, |
| ] |
| -# DrMemory test bots |
| -b_win_drmemory = [ |
| - b_chromium_windows_drmemory_builder, |
| - b_chromium_tests_drmemory, |
| -] |
| - |
| -# Windows Browser (DrMemory light) |
| -for i in range(WINDOWS_BROWSER_DRMEMORY_LIGHT_TESTERS): |
| - c['builders'].append( |
| - windows_browser_drmemory_light_tester( |
| - i + 1, WINDOWS_BROWSER_DRMEMORY_LIGHT_TESTERS)) |
| - |
| -c['builders'].extend(b_win_drmemory) |
| - |
| c['builders'].extend([ |
| { |
| 'name': 'Linux Kitchen (kitchen_run)', |