[Git][qa/jenkins.debian.net][master] reproducible Debian: use systemd-run --same-dir and adjust pathes as needed

[Holger Levsen (@holger)]

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


Commits:
05b2bcd3 by Holger Levsen at 2023-10-14T17:43:50+02:00
reproducible Debian: use systemd-run --same-dir and adjust pathes as needed

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

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -376,9 +376,9 @@ call_diffoscope_on_changes_files() {
 	# for older suites we only keep diffoscope html output, which saves us >70GB diskspace...
 	case "$SUITE" in
 		# add bullseye here once it becomes LTS and also update this comment then
-		buster)	DIFFOSCOPE_OUTPUT="--html $TMPDIR/${DBDREPORT}"
+		buster)	DIFFOSCOPE_OUTPUT="--html ./${DBDREPORT}"
 				;;
-		*)		DIFFOSCOPE_OUTPUT="--html $TMPDIR/${DBDREPORT} --text $TMPDIR/$DBDTXT --json $TMPDIR/$DBDJSON"
+		*)		DIFFOSCOPE_OUTPUT="--html ./${DBDREPORT} --text ./$DBDTXT --json ./$DBDJSON"
 				;;
 	esac
 	set -x
@@ -391,12 +391,12 @@ call_diffoscope_on_changes_files() {
 	##dbd 	-c "$session" \
 	##dbd 	-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
 	( timeout 155m nice sh -c "export TMPDIR=$TEMP ; cd $TMPDIR ; timeout $TIMEOUT ionice -n 6 \
-			systemd-run --scope --user --wait diffoscope \
+			systemd-run --scope --user --wait --collect --same-dir diffoscope \
 			${DIFFOSCOPE_TIMEOUT-} \
 			${DIFFOSCOPE_OUTPUT} \
 			--profile=- \
-			$TMPDIR/b1/${CHANGES} \
-			$TMPDIR/b2/${CHANGES}" \
+			./b1/${CHANGES} \
+			./b2/${CHANGES}" \
 	2>&1 ) >> $TMPLOG
 	RESULT=$?
 	set -e



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/05b2bcd344b9961e55735ee80a4389e1141b6a92
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/20231014/4e5f9bbb/attachment-0001.htm>