[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible debstrap: move the temporary builddir someplace that the jenkins user can delete

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
1aae53db by Mattia Rizzolo at 2022-08-31T13:14:53+02:00
reproducible debstrap: move the temporary builddir someplace that the jenkins user can delete

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

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


Changes:

=====================================
bin/reproducible_debstrap.sh
=====================================
@@ -50,8 +50,10 @@ else
 	CODENAME=sid
 fi
 
-export BUILDDIR=$(mktemp --tmpdir=/srv/workspace/ -d -t ${TOOL}-${SUITE}.XXXXXXXX)
-export RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t ${TOOL}-${SUITE}.XXXXXXXX) # accessible in schroots, used to compare results
+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
 
 # Cleanup if something goes wrong
 trap cleanup INT TERM EXIT


=====================================
hosts/common/etc/sudoers.d/jenkins
=====================================
@@ -23,6 +23,7 @@ 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*, \



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1aae53db590fac8bd4acc879880a91ebed66bba2
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/fa29ebe0/attachment-0001.htm>