When generating text for a BuildLog wiki entry we were hard-coding
the Yocto Project AB URL in the entry's title, rather than that
add a new variable to buildlogger.conf and use the value of this
variable to construct the URL in the link.
Signed-off-by: Joshua Lock <joshua.g.l...@intel.com>
---
bin/buildlogger | 7 +++++--
etc/buildlogger.conf.example | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bin/buildlogger b/bin/buildlogger
index 7a529c0..1b31281 100755
--- a/bin/buildlogger
+++ b/bin/buildlogger
@@ -30,6 +30,7 @@ except ImportError:
sys.exit(1)
abapi = ''
+abwww = ''
# Wiki editing params
un = ''
pw = ''
@@ -49,6 +50,7 @@ def load_config(configfile):
global title
global wikiapi
global abapi
+ global abwww
success = False
if os.path.exists(configfile):
@@ -59,6 +61,7 @@ def load_config(configfile):
pw = config.get('wiki', 'password')
title = config.get('wiki', 'pagetitle')
wikiapi = config.get('wiki', 'apiuri')
+ abwww = config.get('builder', 'wwwuri')
abapi = config.get('builder', 'apiuri')
success = True
except configparser.Error as ex:
@@ -195,8 +198,8 @@ def ab_last_build_to_entry(build_json, build_id):
if prop[0] == 'commit_poky':
chash = prop[1]
- urlfmt = 'https://autobuilder.yoctoproject.org/main/builders/%s/builds/%s/'
- url = urlfmt % (builder, buildid)
+ urlfmt = '%s/builders/%s/builds/%s/'
+ url = urlfmt % (abwww, builder, buildid)
sectionfmt = '==[%s %s %s - %s %s]=='
section_title = sectionfmt % (url, builder, buildid, buildbranch, chash)
summaryfmt = 'Adding new BuildLog entry for build %s (%s)'
diff --git a/etc/buildlogger.conf.example b/etc/buildlogger.conf.example
index 459961c..330af56 100644
--- a/etc/buildlogger.conf.example
+++ b/etc/buildlogger.conf.example
@@ -5,4 +5,5 @@ pagetitle = BuildLogPageTitle
apiuri = https://wiki.yoctoproject.org/wiki/api.php
[builder]
+wwwuri = https://autobuilder.yoctoproject.org/main
apiuri =
https://autobuilder.yoctoproject.org/main/json/builders/nightly/builds/_all
--
2.7.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
