| Message ID | 20190520124716.30472-13-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/vm: serial console autoinstall, misc fixes. | expand |
On 5/20/19 2:47 PM, Gerd Hoffmann wrote: > Instead of fetching the prebuilt image from patchew download the install > iso and prepare the image locally. Install to disk, using the serial > console. Create qemu user, configure ssh login. Install packages > needed for qemu builds. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > Reviewed-by: Kamil Rytarowski <n54@gmx.com> > Tested-by: Thomas Huth <thuth@redhat.com> > --- > tests/vm/netbsd | 187 +++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 177 insertions(+), 10 deletions(-) > > diff --git a/tests/vm/netbsd b/tests/vm/netbsd > index 4c6624ea5ed5..6dbfc1b0fbe3 100755 > --- a/tests/vm/netbsd > +++ b/tests/vm/netbsd > @@ -2,10 +2,11 @@ > # > # NetBSD VM image > # > -# Copyright 2017 Red Hat Inc. > +# Copyright 2017-2019 Red Hat Inc. > # > # Authors: > # Fam Zheng <famz@redhat.com> > +# Gerd Hoffmann <kraxel@redhat.com> > # > # This code is licensed under the GPL version 2 or later. See > # the COPYING file in the top-level directory. > @@ -13,32 +14,198 @@ > > import os > import sys > +import time > import subprocess > import basevm > > class NetBSDVM(basevm.BaseVM): > name = "netbsd" > arch = "x86_64" > + > + link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/images/NetBSD-8.0-amd64.iso" > + size = "20G" > + pkgs = [ > + # tools > + "git-base", > + "pkgconf", > + "xz", > + "python37", > + > + # gnu tools > + "bash", > + "gmake", > + "gsed", > + "flex", "bison", > + > + # libs: crypto > + "gnutls", > + > + # libs: images > + "jpeg", > + "png", > + > + # libs: ui > + "SDL2", > + "gtk3+", > + "libxkbcommon", > + ] > + > BUILD_SCRIPT = """ > set -e; > - rm -rf /var/tmp/qemu-test.* > - cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); > + rm -rf /home/qemu/qemu-test.* > + cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); > + mkdir src build; cd src; > tar -xf /dev/rld1a; > - ./configure --python=python2.7 {configure_opts}; > + cd ../build > + ../src/configure --python=python3.7 --disable-opengl {configure_opts}; > gmake --output-sync -j{jobs} {target} {verbose}; > """ > + poweroff = "/sbin/poweroff" > > def build_image(self, img): > - cimg = self._download_with_cache("http://download.patchew.org/netbsd-7.1-amd64.img.xz", > - sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732') > - img_tmp_xz = img + ".tmp.xz" > + cimg = self._download_with_cache(self.link) > img_tmp = img + ".tmp" > - sys.stderr.write("Extracting the image...\n") > - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) > - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) > + iso = img + ".install.iso" > + > + self.print_step("Preparing iso and disk image") > + subprocess.check_call(["cp", "-f", cimg, iso]) > + subprocess.check_call(["qemu-img", "create", "-f", "qcow2", > + img_tmp, self.size]) > + > + self.print_step("Booting installer") > + self.boot(img_tmp, extra_args = [ > + "-device", "VGA", > + "-machine", "graphics=off", > + "-cdrom", iso > + ]) > + self.console_init() > + self.console_wait("Primary Bootstrap") > + > + # serial console boot menu output doesn't work for some > + # reason, so we have to fly blind ... > + for char in list("5consdev com0\n"): > + time.sleep(0.2) > + self.console_send(char) > + self.console_wait("") > + self.console_wait_send("> ", "boot\n") > + > + self.console_wait_send("Terminal type", "xterm\n") > + self.console_wait_send("a: Installation messages", "a\n") > + self.console_wait_send("b: US-English", "b\n") > + self.console_wait_send("a: Install NetBSD", "a\n") > + self.console_wait("Shall we continue?") > + self.console_wait_send("b: Yes", "b\n") > + > + self.console_wait_send("a: ld0", "a\n") > + self.console_wait_send("a: This is the correct", "a\n") > + self.console_wait_send("b: Use the entire disk", "b\n") > + self.console_wait("NetBSD bootcode") > + self.console_wait_send("a: Yes", "a\n") > + self.console_wait_send("b: Use existing part", "b\n") > + self.console_wait_send("x: Partition sizes ok", "x\n") > + self.console_wait_send("for your NetBSD disk", "\n") > + self.console_wait("Shall we continue?") > + self.console_wait_send("b: Yes", "b\n") > + > + self.console_wait_send("b: Use serial port com0", "b\n") > + self.console_wait_send("f: Set serial baud rate", "f\n") > + self.console_wait_send("a: 9600", "a\n") > + self.console_wait_send("x: Exit", "x\n") > + > + self.console_wait_send("a: Full installation", "a\n") > + self.console_wait_send("a: CD-ROM", "a\n") > + > + self.print_step("Installation started now, this will take a while") > + self.console_wait_send("Hit enter to continue", "\n") > + > + self.console_wait_send("d: Change root password", "d\n") > + self.console_wait_send("a: Yes", "a\n") > + self.console_wait("New password:") > + self.console_send("%s\n" % self.ROOT_PASS) > + self.console_wait("New password:") > + self.console_send("%s\n" % self.ROOT_PASS) > + self.console_wait("Retype new password:") > + self.console_send("%s\n" % self.ROOT_PASS) > + > + self.console_wait_send("o: Add a user", "o\n") > + self.console_wait("username") > + self.console_send("%s\n" % self.GUEST_USER) > + self.console_wait("to group wheel") > + self.console_wait_send("a: Yes", "a\n") > + self.console_wait_send("a: /bin/sh", "a\n") > + self.console_wait("New password:") > + self.console_send("%s\n" % self.GUEST_PASS) > + self.console_wait("New password:") > + self.console_send("%s\n" % self.GUEST_PASS) > + self.console_wait("Retype new password:") > + self.console_send("%s\n" % self.GUEST_PASS) > + > + self.console_wait_send("a: Configure network", "a\n") > + self.console_wait_send("a: vioif0", "a\n") > + self.console_wait_send("Network media type", "\n") > + self.console_wait("autoconfiguration") > + self.console_wait_send("a: Yes", "a\n") > + self.console_wait_send("DNS domain", "localnet\n") > + self.console_wait("Are they OK?") > + self.console_wait_send("a: Yes", "a\n") > + self.console_wait("installed in /etc") > + self.console_wait_send("a: Yes", "a\n") > + > + self.console_wait_send("e: Enable install", "e\n") > + proxy = os.environ.get("http_proxy") > + if not proxy is None: > + self.console_wait_send("f: Proxy", "f\n") > + self.console_wait("Proxy") > + self.console_send("%s\n" % proxy) > + self.console_wait_send("x: Install pkgin", "x\n") > + self.console_init(1200) > + self.console_wait_send("Hit enter to continue", "\n") > + self.console_init() > + > + self.console_wait_send("g: Enable sshd", "g\n") > + self.console_wait_send("x: Finished conf", "x\n") > + self.console_wait_send("Hit enter to continue", "\n") > + > + self.print_step("Installation finished, rebooting") > + self.console_wait_send("d: Reboot the computer", "d\n") > + > + # setup qemu user > + prompt = "localhost$" > + self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) > + self.console_wait_send(prompt, "exit\n") > + > + # setup root user > + prompt = "localhost#" > + self.console_ssh_init(prompt, "root", self.ROOT_PASS) > + self.console_sshd_config(prompt) > + > + # setup virtio-blk #1 (tarfile) > + self.console_wait(prompt) > + self.console_send("echo 'chmod 666 /dev/rld1a' >> /etc/rc.local\n") > + > + # turn off mprotect (conflicts with tcg) > + self.console_wait(prompt) > + self.console_send("echo security.pax.mprotect.enabled=0 >> /etc/sysctl.conf\n") > + > + self.print_step("Configuration finished, rebooting") > + self.console_wait_send(prompt, "reboot\n") > + self.console_wait("login:") > + self.wait_ssh() > + > + self.print_step("Installing packages") > + self.ssh_root_check("pkgin update\n") > + self.ssh_root_check("pkgin -y install %s\n" % " ".join(self.pkgs)) > + > + # shutdown > + self.ssh_root(self.poweroff) > + self.console_wait("entering state S5") > + self.wait() > + > if os.path.exists(img): > os.remove(img) > os.rename(img_tmp, img) > + os.remove(iso) > + self.print_step("All done") > > if __name__ == "__main__": > sys.exit(basevm.main(NetBSDVM)) > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 5/29/19 1:32 PM, Philippe Mathieu-Daudé wrote: > On 5/20/19 2:47 PM, Gerd Hoffmann wrote: >> Instead of fetching the prebuilt image from patchew download the install >> iso and prepare the image locally. Install to disk, using the serial >> console. Create qemu user, configure ssh login. Install packages >> needed for qemu builds. >> >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> >> Reviewed-by: Kamil Rytarowski <n54@gmx.com> >> Tested-by: Thomas Huth <thuth@redhat.com> [...] > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > And now: Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc'ing Marc-André (chardev) On 5/29/19 1:52 PM, Philippe Mathieu-Daudé wrote: > On 5/29/19 1:32 PM, Philippe Mathieu-Daudé wrote: >> On 5/20/19 2:47 PM, Gerd Hoffmann wrote: >>> Instead of fetching the prebuilt image from patchew download the install >>> iso and prepare the image locally. Install to disk, using the serial >>> console. Create qemu user, configure ssh login. Install packages >>> needed for qemu builds. >>> >>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> >>> Reviewed-by: Kamil Rytarowski <n54@gmx.com> >>> Tested-by: Thomas Huth <thuth@redhat.com> > [...] >> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> > > And now: > > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> I tested this using Fedora 29: $ qemu-system-x86_64 -version QEMU emulator version 3.0.1 (qemu-3.0.1-3.fc29) Now testing with: $ qemu-system-x86_64 -version QEMU emulator version 4.0.50 (v4.0.0-798-g8dc7fd56dd) # Configured with: '../configure' '--target-list=x86_64-softmmu' '--disable-tools' I get: ~/source/qemu$ make vm-build-netbsd V=1 [...] con recv: >o: Add a user con recv: x: Finished configuring con recv: >a: Configure network configure o: Add a user con recv: Which network device would you like to use? con recv: con recv: con recv: con recv: con recv: con recv: con recv: con recv: con recv: con recv: con recv: con recv: con recv: con recv: con recv: qqqqqqqqqqqqqqqqqqqqqqqqqk Available interfaces >a: vioif0 con send: a<enter> con recv: x: Exitqqqqqqqqqqqqqqqqqqqqqqqqqj con recv: To be able to use the network, we need answers to the following:Network media type con send: <enter> con recv: : qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqk Perform autoconfiguration? >a: Yes b: Noqqqqqqqqqqqqqqqqq console: *** read timeout *** console: waiting for: 'a: Yes' console: line buffer: con recv: qqqqqqqqqqqqqqj Failed to prepare guest environment Traceback (most recent call last): File "/home/phil/source/qemu/tests/vm/basevm.py", line 350, in main return vm.build_image(args.image) File "tests/vm/netbsd", line 147, in build_image self.console_wait_send("a: Yes", "a\n") File "/home/phil/source/qemu/tests/vm/basevm.py", line 250, in console_wait_send self.console_wait(wait) File "/home/phil/source/qemu/tests/vm/basevm.py", line 212, in console_wait chars = vm.console_socket.recv(1024) timeout: timed out DEBUG:QMP:>>> {'execute': 'quit'} DEBUG:QMP:<<< {u'return': {}} tests/vm/Makefile.include:43: recipe for target '/home/phil/.cache/qemu-vm/images/netbsd.img' failed make: *** [/home/phil/.cache/qemu-vm/images/netbsd.img] Error 2 Did something related to the serial console/chardev change? Anyway your patch works with qemu-stable, so the series is good to go IMO. Regards, Phil.
diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 4c6624ea5ed5..6dbfc1b0fbe3 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -2,10 +2,11 @@ # # NetBSD VM image # -# Copyright 2017 Red Hat Inc. +# Copyright 2017-2019 Red Hat Inc. # # Authors: # Fam Zheng <famz@redhat.com> +# Gerd Hoffmann <kraxel@redhat.com> # # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. @@ -13,32 +14,198 @@ import os import sys +import time import subprocess import basevm class NetBSDVM(basevm.BaseVM): name = "netbsd" arch = "x86_64" + + link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/images/NetBSD-8.0-amd64.iso" + size = "20G" + pkgs = [ + # tools + "git-base", + "pkgconf", + "xz", + "python37", + + # gnu tools + "bash", + "gmake", + "gsed", + "flex", "bison", + + # libs: crypto + "gnutls", + + # libs: images + "jpeg", + "png", + + # libs: ui + "SDL2", + "gtk3+", + "libxkbcommon", + ] + BUILD_SCRIPT = """ set -e; - rm -rf /var/tmp/qemu-test.* - cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); + rm -rf /home/qemu/qemu-test.* + cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); + mkdir src build; cd src; tar -xf /dev/rld1a; - ./configure --python=python2.7 {configure_opts}; + cd ../build + ../src/configure --python=python3.7 --disable-opengl {configure_opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ + poweroff = "/sbin/poweroff" def build_image(self, img): - cimg = self._download_with_cache("http://download.patchew.org/netbsd-7.1-amd64.img.xz", - sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732') - img_tmp_xz = img + ".tmp.xz" + cimg = self._download_with_cache(self.link) img_tmp = img + ".tmp" - sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) + iso = img + ".install.iso" + + self.print_step("Preparing iso and disk image") + subprocess.check_call(["cp", "-f", cimg, iso]) + subprocess.check_call(["qemu-img", "create", "-f", "qcow2", + img_tmp, self.size]) + + self.print_step("Booting installer") + self.boot(img_tmp, extra_args = [ + "-device", "VGA", + "-machine", "graphics=off", + "-cdrom", iso + ]) + self.console_init() + self.console_wait("Primary Bootstrap") + + # serial console boot menu output doesn't work for some + # reason, so we have to fly blind ... + for char in list("5consdev com0\n"): + time.sleep(0.2) + self.console_send(char) + self.console_wait("") + self.console_wait_send("> ", "boot\n") + + self.console_wait_send("Terminal type", "xterm\n") + self.console_wait_send("a: Installation messages", "a\n") + self.console_wait_send("b: US-English", "b\n") + self.console_wait_send("a: Install NetBSD", "a\n") + self.console_wait("Shall we continue?") + self.console_wait_send("b: Yes", "b\n") + + self.console_wait_send("a: ld0", "a\n") + self.console_wait_send("a: This is the correct", "a\n") + self.console_wait_send("b: Use the entire disk", "b\n") + self.console_wait("NetBSD bootcode") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("b: Use existing part", "b\n") + self.console_wait_send("x: Partition sizes ok", "x\n") + self.console_wait_send("for your NetBSD disk", "\n") + self.console_wait("Shall we continue?") + self.console_wait_send("b: Yes", "b\n") + + self.console_wait_send("b: Use serial port com0", "b\n") + self.console_wait_send("f: Set serial baud rate", "f\n") + self.console_wait_send("a: 9600", "a\n") + self.console_wait_send("x: Exit", "x\n") + + self.console_wait_send("a: Full installation", "a\n") + self.console_wait_send("a: CD-ROM", "a\n") + + self.print_step("Installation started now, this will take a while") + self.console_wait_send("Hit enter to continue", "\n") + + self.console_wait_send("d: Change root password", "d\n") + self.console_wait_send("a: Yes", "a\n") + self.console_wait("New password:") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("New password:") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("Retype new password:") + self.console_send("%s\n" % self.ROOT_PASS) + + self.console_wait_send("o: Add a user", "o\n") + self.console_wait("username") + self.console_send("%s\n" % self.GUEST_USER) + self.console_wait("to group wheel") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("a: /bin/sh", "a\n") + self.console_wait("New password:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("New password:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("Retype new password:") + self.console_send("%s\n" % self.GUEST_PASS) + + self.console_wait_send("a: Configure network", "a\n") + self.console_wait_send("a: vioif0", "a\n") + self.console_wait_send("Network media type", "\n") + self.console_wait("autoconfiguration") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("DNS domain", "localnet\n") + self.console_wait("Are they OK?") + self.console_wait_send("a: Yes", "a\n") + self.console_wait("installed in /etc") + self.console_wait_send("a: Yes", "a\n") + + self.console_wait_send("e: Enable install", "e\n") + proxy = os.environ.get("http_proxy") + if not proxy is None: + self.console_wait_send("f: Proxy", "f\n") + self.console_wait("Proxy") + self.console_send("%s\n" % proxy) + self.console_wait_send("x: Install pkgin", "x\n") + self.console_init(1200) + self.console_wait_send("Hit enter to continue", "\n") + self.console_init() + + self.console_wait_send("g: Enable sshd", "g\n") + self.console_wait_send("x: Finished conf", "x\n") + self.console_wait_send("Hit enter to continue", "\n") + + self.print_step("Installation finished, rebooting") + self.console_wait_send("d: Reboot the computer", "d\n") + + # setup qemu user + prompt = "localhost$" + self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_wait_send(prompt, "exit\n") + + # setup root user + prompt = "localhost#" + self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_sshd_config(prompt) + + # setup virtio-blk #1 (tarfile) + self.console_wait(prompt) + self.console_send("echo 'chmod 666 /dev/rld1a' >> /etc/rc.local\n") + + # turn off mprotect (conflicts with tcg) + self.console_wait(prompt) + self.console_send("echo security.pax.mprotect.enabled=0 >> /etc/sysctl.conf\n") + + self.print_step("Configuration finished, rebooting") + self.console_wait_send(prompt, "reboot\n") + self.console_wait("login:") + self.wait_ssh() + + self.print_step("Installing packages") + self.ssh_root_check("pkgin update\n") + self.ssh_root_check("pkgin -y install %s\n" % " ".join(self.pkgs)) + + # shutdown + self.ssh_root(self.poweroff) + self.console_wait("entering state S5") + self.wait() + if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) + os.remove(iso) + self.print_step("All done") if __name__ == "__main__": sys.exit(basevm.main(NetBSDVM))