diff options
| author | Philip Hands <phil@hands.com> | 2016-06-10 09:18:18 +0200 |
|---|---|---|
| committer | Philip Hands <phil@hands.com> | 2016-06-10 11:22:01 +0200 |
| commit | 012cc4bf7e20d7a60191c1221a39d99046363cec (patch) | |
| tree | c6915f6c3baefac3e741e5ad10f9ad5e3cf723af /cucumber | |
| parent | 67ebfb43d4c95a915b1bdc24d6dd4429dfa1e380 (diff) | |
| download | jenkins.debian.net-012cc4bf7e20d7a60191c1221a39d99046363cec.tar.xz | |
lvc: job-specific net name, and don't hardwire UUID
Diffstat (limited to 'cucumber')
| -rw-r--r-- | cucumber/features/domains/default.xml | 2 | ||||
| -rw-r--r-- | cucumber/features/domains/default_net.xml | 2 | ||||
| -rw-r--r-- | cucumber/features/support/config.rb | 4 | ||||
| -rw-r--r-- | cucumber/features/support/helpers/vm_helper.rb | 11 | ||||
| -rw-r--r-- | cucumber/features/support/hooks.rb | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/cucumber/features/domains/default.xml b/cucumber/features/domains/default.xml index 34bcfbf7..5eec9b78 100644 --- a/cucumber/features/domains/default.xml +++ b/cucumber/features/domains/default.xml @@ -33,7 +33,7 @@ <controller type='virtio-serial' index='0'/> <interface type='network'> <!-- <mac address='52:54:00:ac:dd:ee'/> --> - <source network='DebianToasterNet'/> + <source network='lvcNET'/> <model type='virtio'/> <link state='up'/> </interface> diff --git a/cucumber/features/domains/default_net.xml b/cucumber/features/domains/default_net.xml index 88e7a176..35a1c61e 100644 --- a/cucumber/features/domains/default_net.xml +++ b/cucumber/features/domains/default_net.xml @@ -1,5 +1,5 @@ <network> - <name>DebianToasterNet</name> + <name>lvcNET</name> <forward mode='nat'/> <bridge name='virbr10' stp='on' delay='0' /> <ip address='10.2.1.1' netmask='255.255.255.0'> diff --git a/cucumber/features/support/config.rb b/cucumber/features/support/config.rb index 2d13abdd..33380bb0 100644 --- a/cucumber/features/support/config.rb +++ b/cucumber/features/support/config.rb @@ -68,8 +68,8 @@ PATIENCE = ENV['PATIENCE'] || 1 CONFIGURED_KEYSERVER_HOSTNAME = 'hkps.pool.sks-keyservers.net' LIBVIRT_DOMAIN_NAME = "lvcVM-" + JOB_NAME #LIBVIRT_DOMAIN_UUID = "203552d5-819c-41f3-800e-2c8ef2546%03d" % $executor_number -LIBVIRT_NETWORK_NAME = "DebianToasterNet" -LIBVIRT_NETWORK_UUID = "f2305af3-2a64-4f16-afe6-b9dbf02a597e" +LIBVIRT_NETWORK_NAME = "lvcNET" +#LIBVIRT_NETWORK_UUID = "f2305af3-2a64-4f16-afe6-b9dbf02a597e" MISC_FILES_DIR = "/srv/jenkins/cucumber/features/misc_files" SERVICES_EXPECTED_ON_ALL_IFACES = [ diff --git a/cucumber/features/support/helpers/vm_helper.rb b/cucumber/features/support/helpers/vm_helper.rb index 3f172136..dd8ce936 100644 --- a/cucumber/features/support/helpers/vm_helper.rb +++ b/cucumber/features/support/helpers/vm_helper.rb @@ -15,8 +15,15 @@ class VMNet rexml = REXML::Document.new(net_xml) rexml.elements['network'].add_element('name') rexml.elements['network/name'].text = @net_name - rexml.elements['network'].add_element('uuid') - rexml.elements['network/uuid'].text = LIBVIRT_NETWORK_UUID + # PGH + begin + old_net = @virt.lookup_network_by_name(@net_name) + rexml.elements['network'].add_element('uuid') + rexml.elements['network/uuid'].text = old_net.uuid + old_net.undefine + rescue + end + update(rexml.to_s) update(rexml.to_s) rescue Exception => e destroy_and_undefine diff --git a/cucumber/features/support/hooks.rb b/cucumber/features/support/hooks.rb index 684861f6..cad7fb75 100644 --- a/cucumber/features/support/hooks.rb +++ b/cucumber/features/support/hooks.rb @@ -105,7 +105,7 @@ at_exit do VM.remove_all_snapshots $vmstorage.clear_pool end - $vmnet.destroy_and_undefine + #$vmnet.destroy_and_undefine $virt.close end # The artifacts directory is empty (and useless) if it contains |