[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: run diffoscope nicely
Holger Levsen
holger at moszumanska.debian.org
Sun Dec 13 10:56:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit 6970115ca26ea92188e0c5c339dc0f132433b365
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Dec 13 11:56:14 2015 +0100
reproducible: run diffoscope nicely
---
bin/reproducible_build.sh | 4 ++--
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 27ead7b..f316a5c 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 064a930..6b1c54a 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 -- \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list