[Qa-jenkins-scm] [jenkins.debian.net] 11/11: lvc: name the storage after the VM, to avoid conflicts

[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 27c697a62d3e180f81751b854d1f8d573f5260e8
Author: Philip Hands <phil at hands.com>
Date:   Thu Jun 16 20:42:25 2016 +0200

    lvc: name the storage after the VM, to avoid conflicts
    
    perhaps it would be better to prefix volume names in a common pool
    so we could try that at some point
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/domains/storage_pool.xml          | 2 +-
 cucumber/features/support/helpers/storage_helper.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cucumber/features/domains/storage_pool.xml b/cucumber/features/domains/storage_pool.xml
index ce0a691..1e0d6bb 100644
--- a/cucumber/features/domains/storage_pool.xml
+++ b/cucumber/features/domains/storage_pool.xml
@@ -1,5 +1,5 @@
 <pool type="dir">
-  <name>DebianToasterStorage</name>
+  <name></name>
   <target>
     <path></path>
   </target>
diff --git a/cucumber/features/support/helpers/storage_helper.rb b/cucumber/features/support/helpers/storage_helper.rb
index 21537a9..b1f316c 100644
--- a/cucumber/features/support/helpers/storage_helper.rb
+++ b/cucumber/features/support/helpers/storage_helper.rb
@@ -17,7 +17,8 @@ class VMStorage
     @virt = virt
     @xml_path = xml_path
     pool_xml = REXML::Document.new(File.read("#{@xml_path}/storage_pool.xml"))
-    pool_name = pool_xml.elements['pool/name'].text
+    pool_name = LIBVIRT_DOMAIN_NAME
+    pool_xml.elements['pool/name'].text = pool_name
     @pool_path = "#{$config["TMPDIR"]}/#{pool_name}"
     begin
       @pool = @virt.lookup_storage_pool_by_name(pool_name)

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