[Git][qa/jenkins.debian.net][master] reproducible Debian: temporarily use diffoscope from the host, not from a...

[Holger Levsen (@holger)]

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


Commits:
4f9ccd00 by Holger Levsen at 2023-09-05T11:50:01+02:00
reproducible Debian: temporarily use diffoscope from the host, not from a schroot running the tested suite

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

- - - - -


2 changed files:

- bin/reproducible_build.sh
- update_jdn.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -339,23 +339,24 @@ call_diffoscope_on_changes_files() {
 	sed -i -e '/^ [a-f0-9]\{32,64\} .*\.buildinfo$/d' b{1,2}/$CHANGES
 	TMPLOG=$(mktemp --tmpdir=$TMPDIR diffoscope-templog.XXXXXXXX)
 	TIMEOUT="150m"  # note that below there is another instance of this + 5 minutes
-	DBDSUITE=$SUITE
-	if [ "$SUITE" = "experimental" ] ; then
-		# there is no extra diffoscope-schroot for experimental ( because we specical case ghc enough already )
-		DBDSUITE="unstable"
-	fi
+	##dbd DBDSUITE=$SUITE
+	##dbd if [ "$SUITE" = "experimental" ] ; then
+	##dbd	# there is no extra diffoscope-schroot for experimental ( because we specical case ghc enough already )
+	##dbd	DBDSUITE="unstable"
+	##dbd fi
 	# diffoscope temporary files are going to end up in this
 	TEMP=$(mktemp --tmpdir="$TMPDIR" -d dbd-tmp-XXXXXXX)
-	if ! session=$(schroot --begin-session -c "chroot:jenkins-reproducible-$DBDSUITE-diffoscope" 2>&1) ; then
-		# probably this (and the one below) should not end in a FTBR, but rather some tempfail situation.
-		RESULT=99
-		DIFFOSCOPE="diffoscope (schroot error—uset)"
-		MSG_PART1="The schroot service is not available."
-		handle_ftbr "$MSG_PART1" "Error message:"  "\n" "$session"
-		irc_message debian-reproducible-changes "$MSG_PART1 Please check $RBUILDLOG and $DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE"
-		return
-	fi
-	if ! diffoscope_version=$(schroot --directory "$TMPDIR" --run-session -c "$session" diffoscope -- --version 2>&1) ; then
+	##dbd if ! session=$(schroot --begin-session -c "chroot:jenkins-reproducible-$DBDSUITE-diffoscope" 2>&1) ; then
+	##dbd 	# probably this (and the one below) should not end in a FTBR, but rather some tempfail situation.
+	##dbd 	RESULT=99
+	##dbd 	DIFFOSCOPE="diffoscope (schroot error—uset)"
+	##dbd 	MSG_PART1="The schroot service is not available."
+	##dbd 	handle_ftbr "$MSG_PART1" "Error message:"  "\n" "$session"
+	##dbd 	irc_message debian-reproducible-changes "$MSG_PART1 Please check $RBUILDLOG and $DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE"
+	##dbd 	return
+	##dbd fi
+	##dbd if ! diffoscope_version=$(schroot --directory "$TMPDIR" --run-session -c "$session" diffoscope -- --version 2>&1) ; then
+	if ! diffoscope_version=$(diffoscope -- --version 2>&1) ; then
 		RESULT=98
 		DIFFOSCOPE="diffoscope (diffoscope error—unset)"
 		MSG_PART1="First call to diffoscope failed."
@@ -382,11 +383,12 @@ call_diffoscope_on_changes_files() {
 	esac
 	set -x
 	set +e
-	( timeout 155m nice schroot \
-		--directory $TMPDIR \
-		--run-session \
-		-c "$session" \
-		-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
+	##dbd ( timeout 155m nice schroot \
+	##dbd 	--directory $TMPDIR \
+	##dbd 	--run-session \
+	##dbd 	-c "$session" \
+	##dbd 	-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
+	( timeout 155m nice sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
 			${DIFFOSCOPE_TIMEOUT-} \
 			${DIFFOSCOPE_OUTPUT} \
 			--profile=- \
@@ -397,7 +399,7 @@ call_diffoscope_on_changes_files() {
 	set -e
 	if ! "$DEBUG" ; then set +x ; fi
 	log_file $TMPLOG  # print diffoscope output
-	schroot --end-session -c "$session"
+	##dbd schroot --end-session -c "$session"
 	rm $TMPLOG
 	case $RESULT in
 		0)


=====================================
update_jdn.sh
=====================================
@@ -550,6 +550,7 @@ if [ -f /etc/debian_version ] ; then
 				csvtool 
 				dehydrated
 				dehydrated-apache2
+				diffoscope
 				dnsmasq-base 
 				figlet 
 				flex



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

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