MIRRORS/yocto-autobuilder2
1
0
Fork 0
mirror of git://git.yoctoproject.org/yocto-autobuilder2.git synced 2025-07-19 20:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

schedulers: Fix builderNames and handle partial matches to branch names

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2019-11-07 09:08:23 +00:00
parent 471eecf823
commit 1f9f212256
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
schedulers.py
View File

@ -3,6 +3,7 @@ from buildbot.plugins import util
from yoctoabb import config from yoctoabb import config
from twisted.internet import defer from twisted.internet import defer
from twisted.python import log
from yoctoabb.yocto_console_view.yocto_console_view import ReleaseSelector from yoctoabb.yocto_console_view.yocto_console_view import ReleaseSelector
@ -100,12 +101,14 @@ for builder in config.subbuilders:
buttonName="Force Build")) buttonName="Force Build"))
@util.renderer @util.renderer
@defer.inlineCallbacks
def builderNamesFromConfig(props): def builderNamesFromConfig(props):
yp_branch = props.getProperty('yp_build_branch') #log.msg("builderNames: Sourcestamp %s, props %s" % (str(props.sourcestamps), str(props)))
yp_branch = props.getProperty('branch', '')
if yp_branch in config.trigger_builders_wait_releases: for b in config.trigger_builders_wait_releases:
return config.trigger_builders_wait_releases[yp_branch] if yp_branch.startswith(b):
log.msg("builderNames: Filtering branch %s due to entry %s" % (str(yp_branch), str(b)))
return config.trigger_builders_wait_releases[b]
return config.trigger_builders_wait_full return config.trigger_builders_wait_full