summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-06-03 07:03:20 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-03 10:59:38 +0200
commit014ba6b75f581ea333c4f9324ddc59254e695ab5 (patch)
tree642e7e537f587936adaa282e4899b08ebf8b7145
parent92617e5c16ced483fd26039a85b7f81218a93284 (diff)
downloadjenkins.debian.net-014ba6b75f581ea333c4f9324ddc59254e695ab5.tar.xz
lvc: use WORKSPACE rather than PWD
-rwxr-xr-xbin/lvc.sh7
1 files changed, 4 insertions, 3 deletions
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