Skip to content
GitLab
Commit de6dce51 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Archlinux: dont fail the job if diffoscope --version fails 



Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent 8ca7241c
Hide whitespace changes
Inline Side-by-side
bin/reproducible_build_archlinux_pkg.sh
View file @ de6dce51
...@@ -438,13 +438,13 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the ...@@ -438,13 +438,13 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the
echo "</p></body>" echo "</p></body>"
) > "$BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html" ) > "$BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html"
elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] && [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then 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" 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..." echo "$(date -u) - Running $DIFFOSCOPE now..."
call_diffoscope $SRCPACKAGE $ARTIFACT call_diffoscope $SRCPACKAGE $ARTIFACT
elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] || [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then 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 ( rm $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT || rm $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ) 2>/dev/null
else else
# some packages define the package version based on the build date # some packages define the package version based on the build date
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment