[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Archlinux: delete 1st builds artifacts if the 2nd build fails (=fix ftbfs detection)

[Holger Levsen]

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


Commits:
9913493c by Holger Levsen at 2018-10-04T23:49:22Z
reproducible Archlinux: delete 1st builds artifacts if the 2nd build fails (=fix ftbfs detection)

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
=====================================
@@ -430,6 +430,9 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the
 			DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 			echo "$(date -u) - Running $DIFFOSCOPE now..."
 			call_diffoscope $SRCPACKAGE $ARTIFACT
+		elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] || [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then
+			# 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
 			# so our two builds end up with different package versions…



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/9913493cb67d5b63cc5806b28c8cc3a945840923
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/20181004/35cc5a64/attachment.html>