[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Revert "reproducible debian: Hard-code the diffoscope timeout rather than"

[Mattia Rizzolo (@mattia)]

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


Commits:
a6d163da by Mattia Rizzolo at 2022-02-09T09:56:30+01:00
Revert "reproducible debian: Hard-code the diffoscope timeout rather than"

that is not the problem here, rather --timeout is an unknown option
for this diffoscope

This reverts commit b269be014c622ba6c09c7fc011303173858242f4.

- - - - -
c6de3ab7 by Mattia Rizzolo at 2022-02-09T10:03:37+01:00
reproducible debian: make sure to set DIFFOSCOPE when it's available

regression from my last refactor of this piece of code

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

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -362,19 +362,21 @@ call_diffoscope_on_changes_files() {
 		handle_ftbr "$MSG_PART1" "Error message:"  "\n" "$diffoscope_version"
 		irc_message debian-reproducible-changes "$MSG_PART1 Please check $RBUILDLOG and $DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE"
 		return
+	else
+		DIFFOSCOPE=$diffoscope_version
 	fi
 
 	# we have a working diffoscope!
 	log_info "$DIFFOSCOPE will be used to compare the two builds:"
 	set -x
 	set +e
-	# the --timeout 5400 (e.g. 90 minutes) below is arbitrary and can be subject to further evaluation later
+	# the --timeout 90m below is arbitrary and can be subject to further evaluation later
 	( timeout 125m nice schroot \
 		--directory $TMPDIR \
 		--run-session \
 		-c "$session" \
 		-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
-			--timeout 5400 \
+			--timeout $(( 90 * 60 )) \
 			--html $TMPDIR/${DBDREPORT} \
 			--text $TMPDIR/$DBDTXT \
 			--json $TMPDIR/$DBDJSON \



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/b4ec0676ad5128c0d0bdecb4ce6cc9ffe10fd9ae...c6de3ab71a86870f8a8c11b2d6f449abb1219e96

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/b4ec0676ad5128c0d0bdecb4ce6cc9ffe10fd9ae...c6de3ab71a86870f8a8c11b2d6f449abb1219e96
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/20220209/6a197701/attachment.htm>