diff options
author | Philip Hands <phil@hands.com> | 2016-06-03 07:03:20 +0200 |
---|---|---|
committer | Holger Levsen <holger@layer-acht.org> | 2016-06-03 10:59:38 +0200 |
commit | 014ba6b75f581ea333c4f9324ddc59254e695ab5 (patch) | |
tree | 642e7e537f587936adaa282e4899b08ebf8b7145 | |
parent | 92617e5c16ced483fd26039a85b7f81218a93284 (diff) | |
download | jenkins.debian.net-014ba6b75f581ea333c4f9324ddc59254e695ab5.tar.xz |
lvc: use WORKSPACE rather than PWD
-rwxr-xr-x | bin/lvc.sh | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 |