[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: improve logging

[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 51781f8ee0771848b0a594dc49b8abf12ae00d15
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Aug 15 21:48:33 2016 +0200

    reproducible Debian: improve logging
---
 TODO                      | 1 +
 bin/reproducible_build.sh | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 4d74cce..b69753c 100644
--- a/TODO
+++ b/TODO
@@ -118,6 +118,7 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 
 * make reproducible_build.sh rock solid again and get rid off "set -x # # to debug diffoscoppe/schroot problems"
 ** pass scheduled version to remote build nodes and abort the build there if the to be build version is different
+*** the current implementation does this backwards: it first builds and *then* checks on the main node if the build version was right… to make things worse, this check is also broken… 
 ** add check if package to be build has been blacklisted since scheduling and abort
 ** on SIGTERM, also cleanup on remote build nodes there! (via ssh &)
 ** check rbuild logs for "DIFFOSCOPE='E: Failed to change to directory /tmp: Permission denied' and deal with those
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 6363c3c..11727ff 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -774,6 +774,7 @@ check_buildinfo() {
 build_rebuild() {
 	FTBFS=1
 	mkdir b1 b2
+	log_info "Starting 1st build on remote node $NODE1."
 	remote_build 1 $NODE1
 	if [ ! -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] && [ -f b1/${SRCPACKAGE}_*_${ARCH}.changes ] ; then
 			log_error "Version mismatch between main node (${SRCPACKAGE}_${EVERSION}_${ARCH}.dsc expected) and first build node ($(ls b1/*dsc)) for $SUITE/$ARCH, aborting. Please upgrade the schroots..."
@@ -782,7 +783,7 @@ build_rebuild() {
 			NOTIFY=""
 			exit 0
 	elif [ -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
-		log_info "Build successful. Starting remote build."
+		log_info "1st build successful. Starting 2nd build on remote node $NODE2."
 		remote_build 2 $NODE2
 		if [ -f b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
 			# both builds were fine, i.e., they did not FTBFS.

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