From 014ba6b75f581ea333c4f9324ddc59254e695ab5 Mon Sep 17 00:00:00 2001
From: Philip Hands <phil@hands.com>
Date: Fri, 3 Jun 2016 07:03:20 +0200
Subject: lvc: use WORKSPACE rather than PWD

---
 bin/lvc.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/lvc.sh b/bin/lvc.sh
index e0b2bee3..ed88af42 100755
--- a/bin/lvc.sh
+++ b/bin/lvc.sh
@@ -11,8 +11,6 @@ common_init "$@"
 # $1 = wget url/jigdo url
 URL=$1 ; shift
 
-IMAGE=$PWD/$(basename $URL)
-
 cleanup_all() {
         find . -name \*.vlog.png -print0 | xargs -0 -r rm
 	echo "Trying to preserve last screenshot…"
@@ -61,6 +59,9 @@ if [ -z "$WORKSPACE" ] ; then
     WORKSPACE=$PWD
 fi
 RESULTS=$WORKSPACE/results
+
+IMAGE=$WORKSPACE/$(basename $URL)
+
 mkdir -p $RESULTS
 
 mkdir -p $WORKSPACE/DebianToasterStorage
@@ -120,7 +121,7 @@ fi
 
 echo "Debug log available at runtime at https://jenkins.debian.net/view/lvc/job/$JOB_NAME/ws/results/debug.log"
 
-/srv/jenkins/cucumber/bin/run_test_suite --capture-all --keep-snapshots --vnc-server-only --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 "${@}" || {
+/srv/jenkins/cucumber/bin/run_test_suite --capture-all --keep-snapshots --vnc-server-only --iso $IMAGE --tmpdir $WORKSPACE --old-iso $IMAGE -- --format pretty --format pretty_debug --out $WORKSPACE/results/debug.log /srv/jenkins/cucumber/features/step_definitions /srv/jenkins/cucumber/features/support "${@}" || {
   RETVAL=$?
   discard_snapshots DebianToaster
   exit $RETVAL
-- 
cgit v1.2.3-70-g09d2