[Qa-jenkins-scm] [jenkins.debian.net] 01/01: lvc: preserve last screenshot in cleanup

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 174376fd678fff68229c9802f98fb9f346f2af63
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 21 15:48:08 2016 +0200

    lvc: preserve last screenshot in cleanup
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/lvc.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/lvc.sh b/bin/lvc.sh
index 563fa76..d7fc297 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git