From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 2 Dec 2016 21:16:20 +0000 (+0100)
Subject: phase1: use -SNAPSHOT instead of -CURRENT as build designation
X-Git-Tag: v1~207
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=95afef8d93392cfa864385f45a6184419faae9af;p=buildbot.git

phase1: use -SNAPSHOT instead of -CURRENT as build designation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 0aa3e9b..e73f31d 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -118,7 +118,7 @@ from buildbot.changes.gitpoller import GitPoller
 c['change_source'] = []
 c['change_source'].append(GitPoller(
 	repo_url,
-	workdir=home_dir+'/work.git', branch='master',
+	workdir=home_dir+'/work.git', branch=repo_branch,
 	pollinterval=300))
 
 ####### SCHEDULERS
@@ -132,7 +132,7 @@ from buildbot.changes import filter
 c['schedulers'] = []
 c['schedulers'].append(SingleBranchScheduler(
 	name="all",
-	change_filter=filter.ChangeFilter(branch='master'),
+	change_filter=filter.ChangeFilter(branch=repo_branch),
 	treeStableTimer=60,
 	builderNames=targets))
 
@@ -198,7 +198,7 @@ def GetVersionPrefix(props):
 	if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", props["tag"]):
 		return "%s/" % props["tag"]
 	elif basever != "master":
-		return "%s-CURRENT/" % basever
+		return "%s-SNAPSHOT/" % basever
 	else:
 		return ""