summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-03-28 17:00:49 +0100
committerHolger Levsen <holger@layer-acht.org>2015-03-28 17:00:49 +0100
commit9270b53c14da749dd89a93549a04d2eb0f940a9e (patch)
tree45da0401041c7d448878827c664b085c9b7b66ad /bin
parentf3dbeadcca3ce3abb21de9519eb3aa06df7600b3 (diff)
downloadjenkins.debian.net-9270b53c14da749dd89a93549a04d2eb0f940a9e.tar.xz
reproducible: wait longer for lock as we've increased the timeout
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 17e6a73d..dc7a7b5a 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=$?