summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-06-03 11:16:05 +0200
committerPhilip Hands <phil@hands.com>2016-06-05 11:05:38 +0200
commite2e66f95db30e7dd75cd9a835934fb6417ff5eed (patch)
tree454e8da8839716aa9f1533c3bbf7986b04a735e2 /bin
parent39fa440f0f5d7da36cb4f4dcadccbaa795ff0e59 (diff)
downloadjenkins.debian.net-e2e66f95db30e7dd75cd9a835934fb6417ff5eed.tar.xz
lvc: enable parallel VMs (start to anyway)
Diffstat (limited to 'bin')
-rwxr-xr-xbin/lvc.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/lvc.sh b/bin/lvc.sh
index ed88af42..5f7bebae 100755
--- a/bin/lvc.sh
+++ b/bin/lvc.sh
@@ -62,11 +62,13 @@ RESULTS=$WORKSPACE/results
IMAGE=$WORKSPACE/$(basename $URL)
+LIBVIRT_DOMAIN_NAME="lvcVM-$EXECUTOR_NUMBER"
+
mkdir -p $RESULTS
mkdir -p $WORKSPACE/DebianToasterStorage
-discard_snapshots DebianToaster /srv/jenkins/cucumber /srv/jenkins/bin/lvc.sh /srv/jenkins/job-cfg/lvc.yaml $NETBOOT
+discard_snapshots $LIBVIRT_DOMAIN_NAME /srv/jenkins/cucumber /srv/jenkins/bin/lvc.sh /srv/jenkins/job-cfg/lvc.yaml $NETBOOT
trap cleanup_all INT TERM EXIT
@@ -123,7 +125,7 @@ echo "Debug log available at runtime at https://jenkins.debian.net/view/lvc/job/
/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
+ discard_snapshots $LIBVIRT_DOMAIN_NAME
exit $RETVAL
}