[Qa-jenkins-scm] [jenkins.debian.net] 01/05: lvc: enable parallel VMs (start to anyway)

[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 e2e66f95db30e7dd75cd9a835934fb6417ff5eed
Author: Philip Hands <phil at hands.com>
Date:   Fri Jun 3 11:16:05 2016 +0200

    lvc: enable parallel VMs (start to anyway)
---
 bin/lvc.sh                          | 6 ++++--
 cucumber/features/support/config.rb | 6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/lvc.sh b/bin/lvc.sh
index ed88af4..5f7beba 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
 }
 
diff --git a/cucumber/features/support/config.rb b/cucumber/features/support/config.rb
index 7939820..c7caa7c 100644
--- a/cucumber/features/support/config.rb
+++ b/cucumber/features/support/config.rb
@@ -66,10 +66,8 @@ PATIENCE = ENV['PATIENCE'] || 1
 
 # Constants that are statically initialized.
 CONFIGURED_KEYSERVER_HOSTNAME = 'hkps.pool.sks-keyservers.net'
-#LIBVIRT_DOMAIN_NAME = "lvcVM-" + $executor_number
-#LIBVIRT_DOMAIN_UUID = "203552d5-819c-41f3-800e-2c8ef2546" + "%03d" % $executor_number
-LIBVIRT_DOMAIN_NAME = "DebianToaster"
-LIBVIRT_DOMAIN_UUID = "203552d5-819c-41f3-800e-2c8ef2545404"
+LIBVIRT_DOMAIN_NAME = "lvcVM-" + $executor_number
+LIBVIRT_DOMAIN_UUID = "203552d5-819c-41f3-800e-2c8ef2546%03d" % $executor_number
 LIBVIRT_NETWORK_NAME = "DebianToasterNet"
 LIBVIRT_NETWORK_UUID = "f2305af3-2a64-4f16-afe6-b9dbf02a597e"
 MISC_FILES_DIR = "/srv/jenkins/cucumber/features/misc_files"

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