[Qa-jenkins-scm] [jenkins.debian.net] 03/07: reproducible_openwrt_common: b1/b2 for openwrt_build

[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 c813c233bb6083121966f286534477f405c996ca
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Fri Jul 29 14:09:41 2016 -0400

    reproducible_openwrt_common: b1/b2 for openwrt_build
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_openwrt_common.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index 42e65d7..a36fbc2 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -126,6 +126,10 @@ openwrt_build() {
 
 	OPTIONS="-j $NUM_CPU IGNORE_ERRORS=ym BUILD_LOG=1"
 
+	# make $RUN more human readable
+	[ "$RUN" = "b1" ] && RUN="first"
+	[ "$RUN" = "b2" ] && RUN="second"
+
 	echo "============================================================================="
 	echo "$(date -u) - Building OpenWrt ${OPENWRT_VERSION} ($TARGET) - $RUN build run."
 	echo "============================================================================="
@@ -159,7 +163,7 @@ build_two_times() {
 	# FIRST BUILD
 	export TZ="/usr/share/zoneinfo/Etc/GMT+12"
 	MAKE=make
-	openwrt_build "first" "$TARGET"
+	openwrt_build b1 "$TARGET"
 
 	# get banner
 	cat $(find build_dir/ -name banner | grep etc/banner|head -1) > $BANNER_HTML
@@ -184,7 +188,7 @@ build_two_times() {
 	# use allmost all cores for second build
 	NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
 	MAKE="linux64 --uname-2.6 make"
-	openwrt_build "second" "$TARGET"
+	openwrt_build b2 "$TARGET"
 
 	# save results in b2
 	[ "$TYPE" = "lede" ] && save_lede_results b2

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