[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: Bump diffoscope timeouts.

[Holger Levsen (@holger)]

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


Commits:
8d480945 by Vagrant Cascadian at 2022-02-13T11:44:00+01:00
reproducible Debian: Bump diffoscope timeouts.

Bump hard timeouts to 150m and 155m, and diffoscope soft timeout to
120m.

This should avoid regressions in diffoscope where it would complete
successfully between 90m and 120m, before the hard timeouts kick in.

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

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -338,7 +338,7 @@ call_diffoscope_on_changes_files() {
 	# filter lines describing .buildinfo files from .changes file
 	sed -i -e '/^ [a-f0-9]\{32,64\} .*\.buildinfo$/d' b{1,2}/$CHANGES
 	TMPLOG=$(mktemp --tmpdir=$TMPDIR)
-	TIMEOUT="120m"  # note that below there is another instance of this + 5 minutes
+	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 )
@@ -370,13 +370,13 @@ call_diffoscope_on_changes_files() {
 	log_info "$DIFFOSCOPE will be used to compare the two builds:"
 	set -x
 	set +e
-	# the --timeout 90m below is arbitrary and can be subject to further evaluation later
-	( timeout 125m nice schroot \
+	# 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 $(( 90 * 60 )) \
+			--timeout $(( 120 * 60 )) \
 			--html $TMPDIR/${DBDREPORT} \
 			--text $TMPDIR/$DBDTXT \
 			--json $TMPDIR/$DBDJSON \



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/8d480945832219547939ffccbc7395a649d101bf
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/20220213/f6992738/attachment-0001.htm>