[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible arch: only publish logs once the builds are done

[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 48eb6070502e54d063e2d1c27f20e91db8bac1a0
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Oct 16 23:38:20 2015 +0200

    reproducible arch: only publish logs once the builds are done
---
 bin/reproducible_build_arch_pkg.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index b3288d9..80277a6 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -175,15 +175,9 @@ fi
 # build package twice
 mkdir b1 b2
 remote_build 1
-# publish log
-mkdir -p $BASE/archlinux/$SRCPACKAGE/
-cd $TMPDIR/b1/$SRCPACKAGE
-cp build1.log $BASE/archlinux/$SRCPACKAGE/
 # only do the 2nd build if the 1st produced some results
 if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz)" ] ; then
 	remote_build 2
-	cd $TMPDIR/b2/$SRCPACKAGE
-	cp build2.log $BASE/archlinux/$SRCPACKAGE/
 	# run diffoscope on the results
 	TIMEOUT="30m"
 	DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
@@ -195,10 +189,16 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz)" ] ; then
 		# publish page
 		if [ -f $TMPDIR/$SRCPACKAGE/$ARTIFACT.html ] ; then
 			cp $TMPDIR/$SRCPACKAGE/$ARTIFACT.html $BASE/archlinux/$SRCPACKAGE/
-			echo "$(date -u) - $REPRODUCIBLE_URL/archlinux/$SRCPACKAGE/$ARTIFACT.html updated."
 		fi
 	done
 fi
+# publish logs
+mkdir -p $BASE/archlinux/$SRCPACKAGE/
+cd $TMPDIR/b1/$SRCPACKAGE
+cp build1.log $BASE/archlinux/$SRCPACKAGE/
+cd $TMPDIR/b2/$SRCPACKAGE
+[ ! -f build2.log ] || cp build2.log $BASE/archlinux/$SRCPACKAGE/
+echo "$(date -u) - $REPRODUCIBLE_URL/archlinux/$SRCPACKAGE/ updated."
 
 cd
 cleanup_all

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