[Qa-jenkins-scm] [jenkins.debian.net] 02/02: lvc: uniquify VM's serial-port port, based on $executor_number

[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 1463aca603ae160da0ad51c8c218ac8efb790198
Author: Philip Hands <phil at hands.com>
Date:   Wed Jul 20 15:02:25 2016 +0200

    lvc: uniquify VM's serial-port port, based on $executor_number
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/scripts/vm-execute           | 3 ++-
 cucumber/features/support/config.rb            | 1 +
 cucumber/features/support/helpers/vm_helper.rb | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cucumber/features/scripts/vm-execute b/cucumber/features/scripts/vm-execute
index c208217..79b6942 100755
--- a/cucumber/features/scripts/vm-execute
+++ b/cucumber/features/scripts/vm-execute
@@ -12,7 +12,8 @@ def debug_log(*args) ; end
 
 class FakeVM
   def get_remote_shell_port
-    1337
+    # FIXME -- we really ought to be able to ask the vm to dynamically allocate the port, then tell us what it did, rather than this
+    LIBVIRT_REMOTE_SHELL_PORT
   end
 end
 
diff --git a/cucumber/features/support/config.rb b/cucumber/features/support/config.rb
index 33380bb..13578d5 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 db8a2e6..72b244e 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')

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