diff options
| author | Philip Hands <phil@hands.com> | 2016-07-20 15:02:25 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-07-20 15:56:13 +0200 |
| commit | 1463aca603ae160da0ad51c8c218ac8efb790198 (patch) | |
| tree | ecab3132bfd65d96a762250ca002ef5591736073 /cucumber/features/support | |
| parent | 3cea100c594498946683e41129f76e206269fbed (diff) | |
| download | jenkins.debian.net-1463aca603ae160da0ad51c8c218ac8efb790198.tar.xz | |
lvc: uniquify VM's serial-port port, based on $executor_number
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'cucumber/features/support')
| -rw-r--r-- | cucumber/features/support/config.rb | 1 | ||||
| -rw-r--r-- | cucumber/features/support/helpers/vm_helper.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cucumber/features/support/config.rb b/cucumber/features/support/config.rb index 33380bb0..13578d55 100644 --- a/cucumber/features/support/config.rb +++ b/cucumber/features/support/config.rb @@ -70,6 +70,7 @@ LIBVIRT_DOMAIN_NAME = "lvcVM-" + JOB_NAME #LIBVIRT_DOMAIN_UUID = "203552d5-819c-41f3-800e-2c8ef2546%03d" % $executor_number LIBVIRT_NETWORK_NAME = "lvcNET" #LIBVIRT_NETWORK_UUID = "f2305af3-2a64-4f16-afe6-b9dbf02a597e" +LIBVIRT_REMOTE_SHELL_PORT = 13370 + Integer($executor_number) 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 db8a2e67..72b244e4 100644 --- a/cucumber/features/support/helpers/vm_helper.rb +++ b/cucumber/features/support/helpers/vm_helper.rb @@ -80,6 +80,7 @@ class VM rexml = REXML::Document.new(default_domain_xml) rexml.elements['domain'].add_element('name') rexml.elements['domain/name'].text = @domain_name + rexml.elements['domain/devices/serial/source'].attributes['service'] = LIBVIRT_REMOTE_SHELL_PORT begin old_domain = @virt.lookup_domain_by_name(LIBVIRT_DOMAIN_NAME) rexml.elements['domain'].add_element('uuid') |