reproducible Debian: refactoring

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

bin/reproducible_debstrap.sh

@@ -50,10 +50,8 @@ else
 	CODENAME=sid
 fi
 
-mkdir -p /srv/workspace/tempdir/
-BUILDDIR=$(mktemp --tmpdir=/srv/workspace/tempdir/ -d -t "debstrap_${TOOL}-${SUITE}.XXXXXXXX")
-RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t "${TOOL}-${SUITE}.XXXXXXXX") # accessible in schroots, used to compare results
-export BUILDDIR RESULTSDIR
+export BUILDDIR=$(mktemp --tmpdir=/srv/workspace/ -d -t "debstrap_${TOOL}-${SUITE}.XXXXXXXX")
+export RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t "${TOOL}-${SUITE}.XXXXXXXX") # accessible in schroots, used to compare results
 
 # Cleanup if something goes wrong
 trap cleanup INT TERM EXIT

hosts/common/etc/sudoers.d/jenkins

@@ -23,12 +23,9 @@ jenkins ALL=  \
 	/bin/ls -la /media/*, \
 	/bin/rm -rf --one-file-system /chroots/*, \
 	/bin/rm -rf --one-file-system /schroots/*, \
-	/bin/rm -rf --one-file-system /srv/workspace/tempdir/*, \
 	/bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
 	/bin/rm -rf --one-file-system /srv/workspace/live-build*, \
-	/bin/rm -rf --one-file-system /srv/workspace/mmdebstrap*, \
-	/bin/rm -rf --one-file-system /srv/workspace/debootstrap*, \
-	/bin/rm -rf --one-file-system /srv/workspace/cdebootstrap*, \
+	/bin/rm -rf --one-file-system /srv/workspace/debstrap*, \
 	/bin/rm -rf --one-file-system /var/lib/sbuild/build/*, \
 	/bin/rm -rf --one-file-system /var/lib/schroot/union/*, \
 	/bin/rm -rf --one-file-system /tmp/*, \