[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible debian: build: support old stretch's diffoscope that doesn't take --timeout

[Mattia Rizzolo (@mattia)]

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


Commits:
988c1e94 by Mattia Rizzolo at 2022-12-21T15:53:20+01:00
reproducible debian: build: support old stretch's diffoscope that doesn't take --timeout

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

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -333,7 +333,7 @@ diffoscope_timed_out() {
 }
 
 call_diffoscope_on_changes_files() {
-	local TMPLOG TIMEOUT TEMP MSG_PART1 session diffoscope_version
+	local TMPLOG TIMEOUT DIFFOSCOPE_TIMEOUT TEMP MSG_PART1 session diffoscope_version
 	# DIFFOSCOPE is globally used
 	# filter lines describing .buildinfo files from .changes file
 	sed -i -e '/^ [a-f0-9]\{32,64\} .*\.buildinfo$/d' b{1,2}/$CHANGES
@@ -368,15 +368,18 @@ call_diffoscope_on_changes_files() {
 
 	# we have a working diffoscope!
 	log_info "$DIFFOSCOPE will be used to compare the two builds:"
+	if [ $(echo $DIFFOSCOPE_VERSION | awk '{print $2}') -ge 202 ]; then
+		# this --timeout 120m below is arbitrary and can be subject to further evaluation later
+		DIFFOSCOPE_TIMEOUT="--timeout $(( 120 * 60 ))"
+	fi
 	set -x
 	set +e
-	# the --timeout 120m below is arbitrary and can be subject to further evaluation later
 	( timeout 155m nice schroot \
 		--directory $TMPDIR \
 		--run-session \
 		-c "$session" \
 		-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
-			--timeout $(( 120 * 60 )) \
+			${DIFFOSCOPE_TIMEOUT-} \
 			--html $TMPDIR/${DBDREPORT} \
 			--text $TMPDIR/$DBDTXT \
 			--json $TMPDIR/$DBDJSON \



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/988c1e946b5ac4059942464d939d2b3ccdc3900f
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/20221221/48e18521/attachment-0001.htm>