summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-16 21:28:27 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-16 21:28:27 +0200
commit09aaf549abeb94bd0b3d9961f2fe01300e182a48 (patch)
treecc4adc6af953e521b2220f71fb4227a13c0caa2e
parent188d69e869ab422e956e1e5f1dabcf7b34d21dbe (diff)
downloadjenkins.debian.net-09aaf549abeb94bd0b3d9961f2fe01300e182a48.tar.xz
reproducible arch: only run diffoscope on the build artifacts
-rwxr-xr-xbin/reproducible_build_arch_pkg.sh20
1 files changed, 12 insertions, 8 deletions
diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index 67241e5f..0909e72b 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