[buildbot] phase1: use -SNAPSHOT instead of -CURRENT as build designation
LEDE Commits
lede-commits at lists.infradead.org
Fri Dec 2 13:19:28 PST 2016
jow pushed a commit to buildbot.git, branch master:
https://git.lede-project.org/95afef8d93392cfa864385f45a6184419faae9af
commit 95afef8d93392cfa864385f45a6184419faae9af
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Fri Dec 2 22:16:20 2016 +0100
phase1: use -SNAPSHOT instead of -CURRENT as build designation
Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
phase1/master.cfg | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 ""
More information about the lede-commits
mailing list