summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-12-03 18:46:42 +0100
committerHolger Levsen <holger@layer-acht.org>2012-12-03 18:46:42 +0100
commita2ef7ac3bc1acd5beab81dff05f66fc348feaf2f (patch)
tree0a81ba9dd1bc35adc6796823535df52f4449abcf
parent4a31c07210eccff1512493bc9c542397776f71c0 (diff)
downloadjenkins.debian.net-a2ef7ac3bc1acd5beab81dff05f66fc348feaf2f.tar.xz
try harder to end successfully
-rwxr-xr-xbin/cd_tester.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh
index 7aed97e9..a3692c62 100755
--- a/bin/cd_tester.sh
+++ b/bin/cd_tester.sh
@@ -48,6 +48,7 @@ RESULTS=$WORKSPACE/results
cleanup_all() {
set +x
+ set +e
cd $RESULTS
echo -n "Last screenshot: "
(ls -t1 snapshot* | head -1) || true
@@ -60,7 +61,7 @@ cleanup_all() {
#
# kill qemu and image
#
- sudo kill -9 $(ps fax | grep -v grep | grep -v sudo | grep qemu-system | grep ${NAME}-preseed.cfg 2>/dev/null | cut -d " " -f1)
+ sudo kill -9 $(ps fax | grep -v grep | grep -v sudo | grep qemu-system | grep ${NAME}-preseed.cfg 2>/dev/null | cut -d " " -f1) || true
sleep 0.3s
rm $WORKSPACE/$NAME.qcow
#