From 51820dfa52d4be1e13ee0f5587c17ebe0a6dc306 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Mon, 24 Oct 2022 17:09:43 +0200 Subject: [PATCH] phase1: make scheduler and changesource branch-aware MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ForcedScheduler for tags still needs work Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index b4958b9..afc93ce 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -15,7 +15,6 @@ from twisted.python import log 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 @@ -27,7 +26,7 @@ from buildbot.process import results 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 @@ -61,7 +60,6 @@ work_dir = os.path.abspath(ini['general'].get("workdir", ".")) 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"] @@ -279,8 +277,8 @@ populateTargets() 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)) ####### SCHEDULERS @@ -299,7 +297,7 @@ class TagChoiceParameter(BaseParameter): @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( @@ -330,10 +328,10 @@ class TagChoiceParameter(BaseParameter): return s c['schedulers'] = [] -c['schedulers'].append(SingleBranchScheduler( +c['schedulers'].append(AnyBranchScheduler( name = "all", - 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( -- 2.30.2