[Qa-jenkins-scm] [jenkins.debian.net] 01/04: openwrt_common: make save_openwrt_log more flexible to support lede

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 92c5c7f2fd85289f776860d826f8b61fdd6a8dbc
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Sat Jul 23 00:11:16 2016 +0200

    openwrt_common: make save_openwrt_log more flexible to support lede
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_openwrt_common.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index 745a601..c280d05 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -22,10 +22,13 @@ create_results_dirs() {
 	mkdir -p $BASE/openwrt/dbd
 }
 
-save_openwrt_logs() {
-	local postfix="$1"
+# type = openwrt or lede
+# postfix = we use the postfix to save difference of the first and second build
+save_logs() {
+	local type="$1"
+	local postfix="$2"
 
-	tar cJf "$BASE/openwrt/dbd/logs_${postfix}.tar.xz" logs/
+	tar cJf "$BASE/${type}/dbd/logs_${postfix}.tar.xz" logs/
 }
 
 save_lede_results() {
@@ -157,7 +160,7 @@ build_two_times() {
 	[ "$TYPE" = "openwrt" ] && save_openwrt_results b1
 
 	# copy logs
-	save_openwrt_logs b1
+	save_logs $TYPE b1
 
 	# clean up between builds
 	openwrt_cleanup
@@ -179,7 +182,7 @@ build_two_times() {
 	[ "$TYPE" = "openwrt" ] && save_openwrt_results b2
 
 	# copy logs
-	save_openwrt_logs b2
+	save_logs $TYPE b2
 
 	# reset environment to default values again
 	export LANG="en_GB.UTF-8"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git