reproducible Debian: debstrap jobs: temp. call diffoscope differently...

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

bin/reproducible_debstrap.sh

@@ -16,17 +16,19 @@ set -o pipefail # see eg http://petereisentraut.blogspot.com/2010/11/pipefail.ht
 cleanup() {
 	local RESULT=$1
 	output_echo "Cleanup ${RESULT}"
-	# Cleanup the workspace
-	if [ ! -z "${BUILDDIR}" ]; then
-		echo sudo rm -rf --one-file-system ${BUILDDIR}
-	fi
+	# Cleanup the workspace and results directory
+	for CLEANUP in ${BUILDDIR} ${RESULTSDIR} ; do
+		if [ ! -z "$CLEANUP" ]; then
+			echo sudo rm -rf --one-file-system ${CLEANUP}
+		fi
+	done
 }
 
 
 # Init some variables
 export TOOL="$1"
 export SUITE="$2"
-output_echo "About to bootstrap $SUITE using $TOOL."
+output_echo "About to bootstrap $SUITE using $TOOL version $(dpkg-query  --showformat='${Version}' --show $TOOL)."
 export SOURCE_DATE_EPOCH="$(date +%s)"
 output_echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
 export BUILDDIR=$(mktemp --tmpdir=/srv/workspace/ -d -t ${TOOL}-${SUITE}.XXXXXXXX)
@@ -84,7 +86,10 @@ else
 	TIMEOUT="240m"
 	DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 	TMPDIR=${RESULTSDIR}
-	call_diffoscope ${TOOL} ${SUITE}.tar
+	#call_diffoscope ${TOOL} ${SUITE}.tar
+	# the previous, temporarily disabled line is only useful if we also make the .html file visible...
+	schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --restructured-text $RESULTSDIR/${TOOL}_${SUITE}.txt $RESULTSDIR/b1/${TOOL}/${SUITE}.tar $RESULTSDIR/b2/${TOOL}/${SUITE}.tar
+	cat $RESULTSDIR/${TOOL}_${SUITE}.txt
 fi
 
 cleanup success