summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-06 17:33:29 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-06 17:33:29 +0200
commit6339c8371e5fa6dc9b404c2b18b3226c770ec505 (patch)
tree4206e0c497ead6c13c023389ab4e720e8404ee60
parent359ff7193966eca2bf399ab5e1c41d949e3960bf (diff)
downloadjenkins.debian.net-6339c8371e5fa6dc9b404c2b18b3226c770ec505.tar.xz
reproducible: fix timeout handling
-rwxr-xr-xbin/reproducible_build.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0060e2bf..004c53ef 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -173,7 +173,11 @@ for SRCPACKAGE in ${PACKAGES} ; do
LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc)
LOGFILE=$(echo ${LOGFILE%.dsc}.debbindiff.html)
BUILDINFO=${SRCPACKAGE}_${EVERSION}_amd64.buildinfo
- timeout 15m /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes 2>&1 > ${RBUILDLOG} || echo "debbindiff.py was auto killed..." >> ./${LOGFILE}
+ timeout 15m /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes 2>&1 > ${RBUILDLOG}
+ RESULT=$?
+ if [ $RESULT -eq 124 ] ; then
+ echo "$(date) - debbindiff.py was killed after running into timeouot..." >> ./${RBUILDLOG}
+ fi
if [ ! -f ./${LOGFILE} ] && [ -f b1/${BUILDINFO} ] ; then
cleanup_userContent
cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/