[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: wait longer for lock as we've increased the timeout
Holger Levsen
holger at moszumanska.debian.org
Sat Mar 28 16:01:04 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 9270b53c14da749dd89a93549a04d2eb0f940a9e
Author: Holger Levsen <holger at layer-acht.org>
Date: Sat Mar 28 17:00:49 2015 +0100
reproducible: wait longer for lock as we've increased the timeout
---
bin/reproducible_build.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 17e6a73..dc7a7b5 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -70,7 +70,7 @@ call_debbindiff() {
BUILDINFO=${SRCPACKAGE}_${EVERSION}_${ARCH}.buildinfo
# the schroot for debbindiff gets updated once a day. wait patiently if that's the case
if [ -f $DBDCHROOT_WRITELOCK ] || [ -f $DBDCHROOT_READLOCK ] ; then
- for i in $(seq 0 100) ; do
+ for i in $(seq 0 200) ; do
sleep 15
echo "sleeping 15s, debbindiff schroot is locked."
if [ ! -f $DBDCHROOT_WRITELOCK ] && [ ! -f $DBDCHROOT_READLOCK ] ; then
@@ -87,7 +87,7 @@ call_debbindiff() {
touch $DBDCHROOT_READLOCK
fi
echo | tee -a ${RBUILDLOG}
- TIMEOUT="30m"
+ TIMEOUT="30m" # don't forget to also change the "seq 0 200" loop 17 lines above
echo "$(date) - $(schroot --directory /tmp -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --version 2>&1) will be used to compare the two builds now." | tee -a ${RBUILDLOG}
( timeout $TIMEOUT schroot --directory $TMPDIR -c source:jenkins-reproducible-unstable-debbindiff debbindiff -- --html ./${LOGFILE} ./b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ./b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes 2>&1 ) 2>&1 >> ${RBUILDLOG}
RESULT=$?
--
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