diff options
| author | Philip Hands <phil@hands.com> | 2016-06-26 15:45:21 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-06-26 17:08:29 +0200 |
| commit | e3df2d78987243daf2d3349af85d07c12d957fad (patch) | |
| tree | b71bd884d3ba2827bbbf82652352a6b3fb9f5fa7 | |
| parent | ce482092c94ac24412932c624de45a70585e1e31 (diff) | |
| download | jenkins.debian.net-e3df2d78987243daf2d3349af85d07c12d957fad.tar.xz | |
lvc: reinstate remote shell (will break on testing for now)
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rw-r--r-- | cucumber/features/domains/default.xml | 3 | ||||
| -rw-r--r-- | cucumber/features/step_definitions/common_steps.rb | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/cucumber/features/domains/default.xml b/cucumber/features/domains/default.xml index 5eec9b78..782ce473 100644 --- a/cucumber/features/domains/default.xml +++ b/cucumber/features/domains/default.xml @@ -37,12 +37,11 @@ <model type='virtio'/> <link state='up'/> </interface> -<!-- FIXME need to uniquify the port, based on EXECUTOR_NUMBER +<!-- FIXME need to uniquify the port, based on EXECUTOR_NUMBER --> <serial type='tcp'> <source mode="bind" host='127.0.0.1' service='1337'/> <target port='0'/> </serial> ---> <input type='tablet' bus='usb'/> <channel type='spicevmc'> <target type='virtio' name='com.redhat.spice.0'/> diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb index e544cf80..8b06c832 100644 --- a/cucumber/features/step_definitions/common_steps.rb +++ b/cucumber/features/step_definitions/common_steps.rb @@ -278,13 +278,15 @@ Given /^I select the install mode$/ do end end - #@screen.type(Sikuli::Key.TAB) - #@screen.type(' preseed/early_command="echo DPMS=-s\\\\ 0 > /lib/debian-installer.d/S61Xnoblank ; sed -i \'/XF86_Switch_VT_/s/ F\([0-9]\)/ XF86_Switch_VT_\1/\' /usr/share/X11/xkb/symbols/srvr_ctrl ; echo ttyS0::askfirst:-/bin/sh>>/etc/inittab;kill -HUP 1" blacklist=psmouse ' + @boot_options + - # Sikuli::Key.ENTER) - #$vm.wait_until_remote_shell_is_up + @screen.type(Sikuli::Key.TAB) + @boot_options = "" if @boot_options.nil? + @screen.type(' preseed/early_command="echo DPMS=-s\\\\ 0 > /lib/debian-installer.d/S61Xnoblank ; sed -i \'/XF86_Switch_VT_/s/ F\([0-9]\)/ XF86_Switch_VT_\1/\' /usr/share/X11/xkb/symbols/srvr_ctrl ; echo ttyS0::askfirst:-/bin/sh>>/etc/inittab;kill -HUP 1" blacklist=psmouse ' + @boot_options + + Sikuli::Key.ENTER) + debug_log("debug: wait for the remote shell to respond...", :color => :blue) + $vm.wait_until_remote_shell_is_up - debug_log("debug: About to type ENTER at the bootsplash", :color => :blue) - @screen.type(Sikuli::Key.ENTER) # we're disabling the above editing of the command line, since it's breaking on jenkins.debian.net for reasons unknown + #debug_log("debug: About to type ENTER at the bootsplash", :color => :blue) + #@screen.type(Sikuli::Key.ENTER) # we're disabling the above editing of the command line, since it's breaking on jenkins.debian.net for reasons unknown debug_log("debug: waiting for it to get to the 'English' prompt...", :color => :blue) @screen.wait(diui_png("English"), 3*60 * PATIENCE) # FIXME -- this is just to pause until the remote shell would have been up, so is a kludge debug_log("debug: found the 'English' prompt", :color => :blue) |