summaryrefslogtreecommitdiffstats
path: root/cucumber/features/support
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-06-16 20:42:25 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-16 22:33:03 +0200
commit27c697a62d3e180f81751b854d1f8d573f5260e8 (patch)
tree36bcea0973ca00c182e14581cf66fe14664f8a59 /cucumber/features/support
parent7f32d9d2b558269d3090d10cce24bdf42a12257b (diff)
downloadjenkins.debian.net-27c697a62d3e180f81751b854d1f8d573f5260e8.tar.xz
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@layer-acht.org>
Diffstat (limited to 'cucumber/features/support')
-rw-r--r--cucumber/features/support/helpers/storage_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/cucumber/features/support/helpers/storage_helper.rb b/cucumber/features/support/helpers/storage_helper.rb
index 21537a92..b1f316c6 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)