The ForcedScheduler for tags still needs work
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
from buildbot import locks
from buildbot.data import resultspec
from buildbot import locks
from buildbot.data import resultspec
-from buildbot.changes import filter
from buildbot.changes.gitpoller import GitPoller
from buildbot.config import BuilderConfig
from buildbot.plugins import reporters
from buildbot.changes.gitpoller import GitPoller
from buildbot.config import BuilderConfig
from buildbot.plugins import reporters
from buildbot.process.factory import BuildFactory
from buildbot.process.properties import Interpolate
from buildbot.process.properties import Property
from buildbot.process.factory import BuildFactory
from buildbot.process.properties import Interpolate
from buildbot.process.properties import Property
-from buildbot.schedulers.basic import SingleBranchScheduler
+from buildbot.schedulers.basic import AnyBranchScheduler
from buildbot.schedulers.forcesched import BaseParameter
from buildbot.schedulers.forcesched import ForceScheduler
from buildbot.schedulers.forcesched import ValidationError
from buildbot.schedulers.forcesched import BaseParameter
from buildbot.schedulers.forcesched import ForceScheduler
from buildbot.schedulers.forcesched import ValidationError
scripts_dir = os.path.abspath("../scripts")
repo_url = ini['repo'].get("url")
scripts_dir = os.path.abspath("../scripts")
repo_url = ini['repo'].get("url")
-repo_branch = ini['repo'].get("branch", "master")
rsync_defopts = ["-v", "-4", "--timeout=120"]
rsync_defopts = ["-v", "-4", "--timeout=120"]
c['change_source'] = []
c['change_source'].append(GitPoller(
repo_url,
c['change_source'] = []
c['change_source'].append(GitPoller(
repo_url,
- workdir=work_dir+'/work.git', branch=repo_branch,
- pollinterval=300))
+ workdir=work_dir+'/work.git', branches=branchNames,
+ pollAtLaunch=True, pollinterval=300))
@property
def choices(self):
taglist = []
@property
def choices(self):
taglist = []
- basever = re.search(r'-([0-9]+\.[0-9]+)$', repo_branch)
+ basever = re.search(r'-([0-9]+\.[0-9]+)$', "master") # XXX FIXME
if basever:
findtags = subprocess.Popen(
if basever:
findtags = subprocess.Popen(
return s
c['schedulers'] = []
return s
c['schedulers'] = []
-c['schedulers'].append(SingleBranchScheduler(
+c['schedulers'].append(AnyBranchScheduler(
- change_filter = filter.ChangeFilter(branch=repo_branch),
- treeStableTimer = 60,
+ change_filter = util.ChangeFilter(branch=branchNames),
+ treeStableTimer = 15*60,
builderNames = list(targets)))
c['schedulers'].append(ForceScheduler(
builderNames = list(targets)))
c['schedulers'].append(ForceScheduler(