[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Archlinux: dont fail the job if diffoscope --version fails

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
de6dce51 by Holger Levsen at 2019-11-24T19:24:41Z
reproducible Archlinux: dont fail the job if diffoscope --version fails

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_build_archlinux_pkg.sh


Changes:

=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -438,13 +438,13 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the
 				echo "</p></body>"
 			) > "$BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html"
 		elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] && [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then
-			echo "$(date -u) - running diffoscope on the results"
+			echo "$(date -u) - running diffoscope on the results now:"
 			TIMEOUT="60m"
-			DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
+			DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1 || echo 'diffoscope-unknown-version')"
 			echo "$(date -u) - Running $DIFFOSCOPE now..."
 			call_diffoscope $SRCPACKAGE $ARTIFACT
 		elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] || [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then
-			echo "$(date -u) - one of the two builds failed... delete the other one"
+			echo "$(date -u) - one of the two builds failed... delete the other one:"
 			( rm $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT || rm $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ) 2>/dev/null
 		else
 			# some packages define the package version based on the build date



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/de6dce51480c65b2b0696cdfd297ee85327fa918

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/de6dce51480c65b2b0696cdfd297ee85327fa918
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20191124/597e2e81/attachment-0001.html>