diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-12-13 11:56:14 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-12-13 11:56:14 +0100 |
| commit | 6970115ca26ea92188e0c5c339dc0f132433b365 (patch) | |
| tree | a46419a94b6e741fd11c81220da0f37263b597c5 | |
| parent | 53fc2827bd2163cf0bc5a3876e9fb9f51478d652 (diff) | |
| download | jenkins.debian.net-6970115ca26ea92188e0c5c339dc0f132433b365.tar.xz | |
reproducible: run diffoscope nicely
| -rwxr-xr-x | bin/reproducible_build.sh | 4 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 27ead7b5..f316a5c5 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -344,7 +344,7 @@ call_diffoscope_on_changes_files() { set +e set -x # remember to also modify the retry diffoscope call 15 lines below - ( timeout $TIMEOUT schroot \ + ( timeout $TIMEOUT nice schroot \ --directory $TMPDIR \ -c source:jenkins-reproducible-${DBDSUITE}-diffoscope \ -- sh -c "export TMPDIR=$TEMP ; diffoscope \ @@ -360,7 +360,7 @@ call_diffoscope_on_changes_files() { echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not available, will sleep 2min and retry." sleep 2m # remember to also modify the retry diffoscope call 15 lines above - ( timeout $TIMEOUT schroot \ + ( timeout $TIMEOUT nice schroot \ --directory $TMPDIR \ -c source:jenkins-reproducible-${DBDSUITE}-diffoscope \ -- sh -c "export TMPDIR=$TEMP ; diffoscope \ diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 064a9303..6b1c54a8 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -506,7 +506,7 @@ call_diffoscope() { local msg="" set +e # remember to also modify the retry diffoscope call 15 lines below - ( timeout $TIMEOUT schroot \ + ( timeout $TIMEOUT nice schroot \ --directory $TMPDIR \ -c source:jenkins-reproducible-${DBDSUITE}-diffoscope \ diffoscope -- \ @@ -521,7 +521,7 @@ call_diffoscope() { echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not available, will sleep 2min and retry." sleep 2m # remember to also modify the retry diffoscope call 15 lines above - ( timeout $TIMEOUT schroot \ + ( timeout $TIMEOUT nice schroot \ --directory $TMPDIR \ -c source:jenkins-reproducible-${DBDSUITE}-diffoscope \ diffoscope -- \ |