summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-05-21 15:48:08 +0200
committerHolger Levsen <holger@layer-acht.org>2016-05-21 15:48:08 +0200
commit174376fd678fff68229c9802f98fb9f346f2af63 (patch)
tree09f8161f7f0d7933c85f8700fde9dc70be325c8f
parente0e5bb3fd2775763dfd2806536ce55e899c08f1c (diff)
downloadjenkins.debian.net-174376fd678fff68229c9802f98fb9f346f2af63.tar.xz
lvc: preserve last screenshot in cleanup
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/lvc.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/lvc.sh b/bin/lvc.sh
index 563fa769..d7fc2975 100755
--- a/bin/lvc.sh
+++ b/bin/lvc.sh
@@ -14,7 +14,13 @@ URL=$1 ; shift
IMAGE=$PWD/$(basename $URL)
cleanup_all() {
- find . -name \*.vlog.png -print0 | xargs -0 -r rm
+ find . -name \*.vlog.png -print0 | xargs -0 -r rm
+ echo "Trying to preserve last screenshot…"
+ LAST_SCREENSHOT=$(ls -t1 results/*.png | head -1)
+ if [ -e "$LAST_SCREENSHOT" ] ; then
+ cp $LAST_SCREENSHOT $WORKSPACE/screenshot.png
+ convert $WORKSPACE/screenshot.png -adaptive-resize 128x96 $WORKSPACE/screenshot-thumb.png
+ fi
}
fetch_if_newer() {
@@ -110,12 +116,6 @@ echo "Debug log available at runtime at https://jenkins.debian.net/view/lvc/job/
/srv/jenkins/cucumber/bin/run_test_suite --vnc-server-only --capture-all --iso $IMAGE --tmpdir $PWD --old-iso $IMAGE -- --format pretty --format pretty_debug --out $PWD/results/debug.log /srv/jenkins/cucumber/features/step_definitions /srv/jenkins/cucumber/features/support "${@}"
-echo "Trying to preserve last screenshot…"
-LAST_SCREENSHOT=$(ls -t1 results/*.png | head -1)
-if [ -e "$LAST_SCREENSHOT" ] ; then
- cp $LAST_SCREENSHOT $WORKSPACE/screenshot.png
- convert $WORKSPACE/screenshot.png -adaptive-resize 128x96 $WORKSPACE/screenshot-thumb.png
-fi
cleanup_all