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

[Holger Levsen (@holger)]

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


Commits:
145e0663 by Holger Levsen at 2022-08-29T19:30:19+02:00
reproducible Debian: refactoring

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

- - - - -
369289bd by Holger Levsen at 2022-08-29T19:30:28+02:00
Revert "reproducible Debian: enable debug output"

This reverts commit b2ed852e7483523a1346fca39a7a42190f33d0e5.

- - - - -
bf292af4 by Holger Levsen at 2022-08-29T19:32:37+02:00
reproducible Debian: fix sudoers syntax again

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
=====================================
@@ -4,7 +4,7 @@
 # Copyright 2021-2022 Holger Levsen <holger at layer-acht.org>
 # released under the GPLv2
 
-DEBUG=true
+DEBUG=false
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
@@ -38,8 +38,6 @@ trap cleanup INT TERM EXIT
 delay_start
 
 # Actual run ${TOOL} twice
-mkdir -p $BUILDDIR/b1/${TOOL}
-mkdir -p $BUILDDIR/b2/${TOOL}
 for LOOP in "first" "second" ; do
 	case $LOOP in
 		first)	SUBDIR=b1
@@ -55,6 +53,7 @@ for LOOP in "first" "second" ; do
 			;;
 	esac
 	output_echo "$ACTION ${TOOL} $SUITE for the $LOOP run."
+	mkdir -p $BUILDDIR/$SUBDIR/${TOOL}
 	case ${TOOL} in
 		mmdebstrap)	sudo $REALTOOL $SUITE > $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar
 				;;


=====================================
hosts/common/etc/sudoers.d/jenkins
=====================================
@@ -24,7 +24,8 @@ jenkins ALL=  \
 	/bin/rm -rf --one-file-system /schroots/*, \
 	/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/*debstrap*, \
+	/bin/rm -rf --one-file-system /srv/workspace/mmdebstrap*, \
+	/bin/rm -rf --one-file-system /srv/workspace/debootstrap*, \
 	/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/-/compare/297b9827e1df1d5580f9794177abf304531a7aee...bf292af4d880bc3543e9744e592feeef66481367

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/297b9827e1df1d5580f9794177abf304531a7aee...bf292af4d880bc3543e9744e592feeef66481367
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/20220829/f297f7cf/attachment-0001.htm>