summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-09 12:15:34 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-09 12:15:34 +0200
commit7a33e995f3451dd74f0129091d5a5009132f09ee (patch)
treee27887cb10340164e8919443d90565d08574cf82 /bin
parent902672f63aba3b0be69a5ab25232e9f5a5bc0435 (diff)
downloadjenkins.debian.net-7a33e995f3451dd74f0129091d5a5009132f09ee.tar.xz
reproducible: try harder to capture crashing debbindiff output. also report crashing.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 421a426d..507072c4 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -177,11 +177,13 @@ for SRCPACKAGE in ${PACKAGES} ; do
LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc)
LOGFILE=$(echo ${LOGFILE%.dsc}.debbindiff.html)
BUILDINFO=${SRCPACKAGE}_${EVERSION}_amd64.buildinfo
- timeout --foreground 15m /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes 2>&1 >> ${RBUILDLOG}
+ ( 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=$?
set -e
if [ $RESULT -eq 124 ] ; then
echo "$(date) - debbindiff.py was killed after running into timeouot..." >> ${RBUILDLOG}
+ elif [ $RESULT -eq 1 ] ; then
+ echo "$(date) - debbindiff.py crashed..." >> ${RBUILDLOG}
fi
if [ ! -f ./${LOGFILE} ] && [ -f b1/${BUILDINFO} ] ; then
cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/