Created
November 4, 2019 22:13
-
-
Save raharper/97a77a7780380a36109928c0ee02a608 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py | |
index 593db694..b317e0ec 100644 | |
--- a/tests/vmtests/__init__.py | |
+++ b/tests/vmtests/__init__.py | |
@@ -896,7 +896,8 @@ class VMBaseClass(TestCase): | |
cmd = ["tools/launch", "--arch=" + cls.arch, "-v", dowait, | |
"--smp=" + cls.get_config_smp(), "--mem=%s" % cls.mem] | |
if not cls.interactive: | |
- cmd.extend(["--silent", "--power=off"]) | |
+ #cmd.extend(["--silent", "--power=off"]) | |
+ cmd.extend(["--silent", "--power=on"]) | |
cmd.extend(["--serial-log=" + cls.install_log]) | |
@@ -1944,9 +1945,9 @@ def generate_user_data(collect_scripts=None, apt_proxy=None, | |
base_cloudconfig = { | |
'password': 'passw0rd', | |
'chpasswd': {'expire': False}, | |
- 'power_state': {'mode': 'poweroff'}, | |
'network': {'config': 'disabled'}, | |
} | |
+ # 'power_state': {'mode': 'poweroff'}, | |
ssh_keys, _err = util.subp(['tools/ssh-keys-list', 'cloud-config'], | |
capture=True) | |
diff --git a/tools/launch b/tools/launch | |
index b273de48..ccbb676d 100755 | |
--- a/tools/launch | |
+++ b/tools/launch | |
@@ -794,8 +794,9 @@ main() { | |
fi | |
serial_args="-nodefaults -chardev ${chardev_arg},id=charconsole0 -device sclpconsole,chardev=charconsole0,id=console0" | |
else | |
- serial_args="-serial file:${serial_log}" | |
+ #serial_args="-serial file:${serial_log}" | |
#debug mode serial_args="-serial ${serial_log} -monitor stdio" | |
+ serial_args="-serial telnet:localhost:2446,server,nowait -monitor stdio" | |
fi | |
fi | |
cmd=( | |
diff --git a/tools/xkvm b/tools/xkvm | |
index dbcba6f6..b339780f 100755 | |
--- a/tools/xkvm | |
+++ b/tools/xkvm | |
@@ -535,6 +535,8 @@ main() { | |
connections[$i]="$bridge" | |
fi | |
netopts="${netopts},id=$id" | |
+ # enable ssh forward on first nic | |
+ [ "$id" == "net00" ] && netopts="${netopts},hostfwd=tcp::22222-:22" | |
[ "$ntype" = "tap" ] && netopts="${netopts},script=no,downscript=no" | |
model="${def_netmodel}" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Use with:
% cd curtin
% patch -p1 < curtin-debug-vmtest.patch
% ./tools/jenkins-runner ...
In separate window1, connect to serial console of VM
% telnet localhost 2446
In separate window2, after boot is complete/networking up
% ssh -p 22222 ubuntu@localhost