[buildbot] phase2: adjust change filter

[LEDE Commits]

jow pushed a commit to buildbot.git, branch master:
https://git.lede-project.org/a51b2c428e09a2fb6bbcb5439e2b9cbb92175b1c

commit a51b2c428e09a2fb6bbcb5439e2b9cbb92175b1c
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Fri Dec 2 22:44:18 2016 +0100

    phase2: adjust change filter
    
    Instead of hardcoding the master branch, filter incoming changes by the branch
    used for the corresponding feed.
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 phase2/master.cfg | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/phase2/master.cfg b/phase2/master.cfg
index ddcca29..1c7553e 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -119,6 +119,7 @@ while True:
 
 # find feeds
 feeds = []
+feedbranches = dict()
 
 from buildbot.changes.gitpoller import GitPoller
 c['change_source'] = []
@@ -130,6 +131,7 @@ with open(home_dir+'/source.git/feeds.conf.default', 'r') as f:
 			feeds.append(parts)
 			url = parts[2].strip().split(';')
 			branch = url[1] if len(url) > 1 else 'master'
+			feedbranches[url[0]] = branch
 			c['change_source'].append(GitPoller(url[0], branch=branch, workdir='%s/%s.git' %(os.getcwd(), parts[1]), pollinterval=300))
 
 
@@ -138,13 +140,15 @@ with open(home_dir+'/source.git/feeds.conf.default', 'r') as f:
 # Configure the Schedulers, which decide how to react to incoming changes.  In this
 # case, just kick off a 'basebuild' build
 
+def branch_change_filter(change):
+	return change.branch == feedbranches[change.repository]
+
 from buildbot.schedulers.basic import SingleBranchScheduler
 from buildbot.schedulers.forcesched import ForceScheduler
-from buildbot.changes import filter
 c['schedulers'] = []
 c['schedulers'].append(SingleBranchScheduler(
 	name="all",
-	change_filter=filter.ChangeFilter(branch='master'),
+	change_filter=filter.ChangeFilter(filter_fn=branch_change_filter),
 	treeStableTimer=60,
 	builderNames=archnames))