[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: refactoring

[Holger Levsen (@holger)]

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


Commits:
4fa4ecce by Holger Levsen at 2022-08-31T16:30:39+02:00
reproducible Debian: refactoring

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

- - - - -


2 changed files:

- bin/reproducible_debstrap.sh
- hosts/common/etc/sudoers.d/jenkins


Changes:

=====================================
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/*, \



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/4fa4eccef28705118b49028690ba14970280bbd8

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/4fa4eccef28705118b49028690ba14970280bbd8
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/20220831/ebbbe721/attachment-0001.htm>