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

[Vagrant Cascadian (@vagrant)]

Vagrant Cascadian pushed to branch master at Debian QA / jenkins.debian.net


Commits:
b269be01 by Vagrant Cascadian at 2022-02-05T17:39:25-08:00
reproducible debian: Hard-code the diffoscope timeout rather than
calculating it.

Sometimes diffoscope is getting pass an empty argument to --timeout:

  diffoscope: error: unrecognized arguments: --timeout /srv/reproducible-results/rbuild-debian/tmp.2dVDO4MyJG/b2/python-circuitbreaker_1.3.2-2_amd64.changes

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -368,13 +368,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
+	# the --timeout 5400 (e.g. 90 minutes) 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 $(( 90 * 60 )) \
+			--timeout 5400 \
 			--html $TMPDIR/${DBDREPORT} \
 			--text $TMPDIR/$DBDTXT \
 			--json $TMPDIR/$DBDJSON \



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b269be014c622ba6c09c7fc011303173858242f4
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/20220206/3d1b44a9/attachment-0001.htm>