[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible arch: only run diffoscope on the build artifacts

[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 09aaf549abeb94bd0b3d9961f2fe01300e182a48
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Oct 16 21:28:27 2015 +0200

    reproducible arch: only run diffoscope on the build artifacts
---
 bin/reproducible_build_arch_pkg.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index 67241e5..0909e72 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -138,14 +138,14 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then
 	TMPDIR="$3"
 	[ -d $TMPDIR ] || mkdir -p $TMPDIR
 	cd $TMPDIR
-	mkdir -p b$MODE/archlinux/$SRCPACKAGE
+	mkdir -p b$MODE/$SRCPACKAGE
 	if [ "$MODE" = "1" ] ; then
 		first_build
 	else
 		second_build
 	fi
 	# preserve results and delete build directory
-	mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE/*-x86_64.pkg.tar.?? $TMPDIR/b$MODE/archlinux/$SRCPACKAGE
+	mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE/*-x86_64.pkg.tar.?? $TMPDIR/b$MODE/$SRCPACKAGE/
 	rm -r /tmp/$SRCPACKAGE-$(basename $TMPDIR)/
 	echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME done."
 	exit 0
@@ -180,12 +180,16 @@ build_rebuild
 TIMEOUT="30m"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "$(date -u) - Running $DIFFOSCOPE now..."
-call_diffoscope archlinux $SRCPACKAGE
-# publish page
-if [ -f $TMPDIR/archlinux/$SRCPACKAGE.html ] ; then
-	cp $TMPDIR/archlinux/$SRCPACKAGE.html $BASE/archlinux
-	echo "$(date -u) - $REPRODUCIBLE_URL/archlinux/$SRCPACKAGE.html updated."
-fi
+cd $TMPDIR/b1/$SRCPACKAGE
+for ARTIFACT in *-x86_64.pkg.tar.?? ; do
+	call_diffoscope $SRCPACKAGE $ARTIFACT
+	# publish page
+	if [ -f $TMPDIR/$SRCPACKAGE/$ARTIFACT.html ] ; then
+		mkdir -p $BASE/archlinux/$SRCPACKAGE/
+		cp $TMPDIR/$SRCPACKAGE/$ARTIFACT.html $BASE/archlinux/$SRCPACKAGE/
+		echo "$(date -u) - $REPRODUCIBLE_URL/archlinux/$SRCPACKAGE/$ARTIFACT.html updated."
+	fi
+done
 
 cd
 cleanup_all

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