From fbfbdbe9ea27fc94ea11ca32b6394a13970ed892 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 16 May 2012 12:00:26 +0000 Subject: [PATCH] Making the old bots also trigger on source changes. The old scheduler was missing the branch configuration, that was started being used as a consequence of adapting the Chromium Buildbot scripts. TBR=phoglund BUG=None TEST=Tested on live master+slaves with manual edits. Review URL: https://webrtc-codereview.appspot.com/576012 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2250 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../build_internal/masters/master.webrtc/master.cfg | 2 +- .../build_internal/masters/master.webrtc/master_builders_cfg.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/continuous_build/build_internal/masters/master.webrtc/master.cfg b/tools/continuous_build/build_internal/masters/master.webrtc/master.cfg index ac4b5244ab..4cfeff1e23 100755 --- a/tools/continuous_build/build_internal/masters/master.webrtc/master.cfg +++ b/tools/continuous_build/build_internal/masters/master.webrtc/master.cfg @@ -37,7 +37,7 @@ master_source_cfg.ConfigureChangeSource(config, c) ####### SCHEDULERS from buildbot.scheduler import Scheduler -webrtc_scheduler = Scheduler(name='all', branch=None, +webrtc_scheduler = Scheduler(name='all', branch='trunk', builderNames=['Win32Debug', 'Win32Release', 'MacOS32DBG', diff --git a/tools/continuous_build/build_internal/masters/master.webrtc/master_builders_cfg.py b/tools/continuous_build/build_internal/masters/master.webrtc/master_builders_cfg.py index b4f59edf60..9a29de2c9b 100644 --- a/tools/continuous_build/build_internal/masters/master.webrtc/master_builders_cfg.py +++ b/tools/continuous_build/build_internal/masters/master.webrtc/master_builders_cfg.py @@ -14,7 +14,6 @@ __author__ = 'kjellander@webrtc.org (Henrik Kjellander)' from buildbot.schedulers import timed from master import master_config -from webrtc_buildbot import webrtc_factory from webrtc_buildbot import webrtc_chromium_factory # Used to put builders into different categories by the Helper class.