summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-17 12:59:10 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-17 12:59:10 +0200
commitd04d61eb137cb866bf848b878a53cd4513ce566f (patch)
tree6ef4a89c57f71c4cb4c140de4a8904c0aa92e90d
parent890412ce5c0c1d2224c269567508bf9a82145da2 (diff)
downloadjenkins.debian.net-d04d61eb137cb866bf848b878a53cd4513ce566f.tar.xz
g-i-installation: detect 'Reached target Shutdown' in output and act accordingly
-rwxr-xr-xbin/g-i-installation.sh1
-rwxr-xr-xbin/reproducible_build.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index df50aa8f..ebcc876b 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -908,6 +908,7 @@ monitor_system() {
rm $GOCR $GOCR.ppm
if [[ "$LAST_LINE" =~ .*Power\ down.* ]] ||
[[ "$LAST_LINE" =~ .*System\ halted.* ]] ||
+ [[ "$LAST_LINE" =~ .*Reached target Shutdown.* ]] ||
[[ "$LAST_LINE" =~ .*Cannot\ .inalize\ remaining\ .ile\ systems.* ]]; then
echo "QEMU was powered down."
break
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 324036ca..d7fe7952 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -129,6 +129,7 @@ else
( 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
+ echo | tee -a ${RBUILDLOG}
if [ $RESULT -eq 124 ] ; then
echo "$(date) - debbindiff.py was killed after running into timeouot..." | tee -a ${RBUILDLOG}
elif [ $RESULT -eq 1 ] ; then
@@ -137,7 +138,6 @@ else
if [ ! -f ./${LOGFILE} ] && [ -f b1/${BUILDINFO} ] ; then
cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/
figlet ${SRCPACKAGE}
- echo | tee -a ${RBUILDLOG}
echo "debbindiff.py found no differences in the changes files, and a .buildinfo file also exist." | tee -a ${RBUILDLOG}
echo "${SRCPACKAGE} built successfully and reproducibly." | tee -a ${RBUILDLOG}
sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"reproducible\", \"$DATE\")"