Commit a2baddb7 authored by Vagrant Cascadian's avatar Vagrant Cascadian
Browse files

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.
parent dcb05a2e
...@@ -338,7 +338,7 @@ call_diffoscope_on_changes_files() { ...@@ -338,7 +338,7 @@ call_diffoscope_on_changes_files() {
# filter lines describing .buildinfo files from .changes file # filter lines describing .buildinfo files from .changes file
sed -i -e '/^ [a-f0-9]\{32,64\} .*\.buildinfo$/d' b{1,2}/$CHANGES sed -i -e '/^ [a-f0-9]\{32,64\} .*\.buildinfo$/d' b{1,2}/$CHANGES
TMPLOG=$(mktemp --tmpdir=$TMPDIR) 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 DBDSUITE=$SUITE
if [ "$SUITE" = "experimental" ] ; then if [ "$SUITE" = "experimental" ] ; then
# there is no extra diffoscope-schroot for experimental ( because we specical case ghc enough already ) # there is no extra diffoscope-schroot for experimental ( because we specical case ghc enough already )
...@@ -370,13 +370,13 @@ call_diffoscope_on_changes_files() { ...@@ -370,13 +370,13 @@ call_diffoscope_on_changes_files() {
log_info "$DIFFOSCOPE will be used to compare the two builds:" log_info "$DIFFOSCOPE will be used to compare the two builds:"
set -x set -x
set +e set +e
# the --timeout 90m below is arbitrary and can be subject to further evaluation later # the --timeout 120m below is arbitrary and can be subject to further evaluation later
( timeout 125m nice schroot \ ( timeout 155m nice schroot \
--directory $TMPDIR \ --directory $TMPDIR \
--run-session \ --run-session \
-c "$session" \ -c "$session" \
-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \ -- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
--timeout $(( 90 * 60 )) \ --timeout $(( 120 * 60 )) \
--html $TMPDIR/${DBDREPORT} \ --html $TMPDIR/${DBDREPORT} \
--text $TMPDIR/$DBDTXT \ --text $TMPDIR/$DBDTXT \
--json $TMPDIR/$DBDJSON \ --json $TMPDIR/$DBDJSON \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment