From 3a528e2d4e6f0d21b7806daa9dd8acc07f276cac Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 28 Mar 2015 17:03:11 +0100 Subject: reproducible: wait longer for lock as we've increased the timeout - the real solution is to use schroot sessions properly... --- bin/reproducible_build.sh | 2 +- bin/reproducible_common.sh | 2 +- bin/reproducible_setup_schroot.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index dc7a7b5a..b9c63728 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 200) ; do + for i in $(seq 0 200) ; do # this loop also exists in _common.sh and _setup_pbuilder.sh sleep 15 echo "sleeping 15s, debbindiff schroot is locked." if [ ! -f $DBDCHROOT_WRITELOCK ] && [ ! -f $DBDCHROOT_READLOCK ] ; then diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index ed5b93b8..b65fba7c 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -11,7 +11,7 @@ PACKAGES_DB=/var/lib/jenkins/reproducible.db INIT=/var/lib/jenkins/reproducible.init if [ -f $PACKAGES_DB ] && [ -f $INIT ] ; then if [ -f ${PACKAGES_DB}.lock ] ; then - for i in $(seq 0 100) ; do + for i in $(seq 0 200) ; do sleep 15 echo "sleeping 15s, $PACKAGES_DB is locked." if [ ! -f ${PACKAGES_DB}.lock ] ; then diff --git a/bin/reproducible_setup_schroot.sh b/bin/reproducible_setup_schroot.sh index f9663393..c8f9a569 100755 --- a/bin/reproducible_setup_schroot.sh +++ b/bin/reproducible_setup_schroot.sh @@ -117,7 +117,7 @@ trap remove_writelock INT TERM EXIT touch $DBDCHROOT_WRITELOCK if [ -f $DBDCHROOT_READLOCK ] ; then # patiently wait for our users to using the schroot - for i in $(seq 0 100) ; do + for i in $(seq 0 200) ; do sleep 15 echo "sleeping 15s, debbindiff schroot is locked and used." if [ ! -f $DBDCHROOT_READLOCK ] ; then -- cgit v1.2.3-54-g00ecf