From patchwork Thu Oct 24 10:22:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 177395 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp1979880ill; Thu, 24 Oct 2019 03:27:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqyFcnzT9yJ1bQouLqaYWmhFnD3/Bwy/r9+8UACeWKliHpxLEq6VCqSFmiIPHvtoaz1NwsFt X-Received: by 2002:ad4:43e9:: with SMTP id f9mr773251qvu.66.1571912839259; Thu, 24 Oct 2019 03:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571912839; cv=none; d=google.com; s=arc-20160816; b=QVwtZaXfbLBiBEmr8omlrex/HvRzCMIHNZgeGyMHZRiL9EQbpwBsqwn1g4QwIgp5ou iTrS+3fsu9JPVavwrdfw3kkDaar0d/8zFhaHTWG+YC9P+KXIS5cmsjib3NT4IUAV+yJM nMw0ArfH5HTricCnZJ1QUOGiYRj3td85bg0hRemyYvxdsnXUuUS/HhS3GTSo40Hn57DZ WCgJbQWMNQ1DSmnY93+b0Macltq8uC8q3iVBsYcmlc0NF/VqIBwj7HbDSmBCBYyQwDVB 7BFQvgSHMuzXxN0WOQvb7MG7b+6ZnpetmsdLeDvlFlZUA5TeNgRhSnLeSYy1m/7yI5SM ZFAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=O1yTnwnOMYBWFrsx8+srCnJtUFWB2Fa+51tIMG3xU7M=; b=k2tiHB5141auZ8T6zDydamuiwhagGgks3xRWnA/kT918ascUuJXP4Ts1191V3DbYi1 GorPog9CtPFee/EmWd0YJFIhX1EZUKMmEcgu28eMk80PGFyOEMjbw8aKvfkxA1HlbxHg gjigG95xut7WIoaGmlvqfvyWLj3G3lPSRf+0Z/eqlD8QNJoMHm1HHxd2PK8yknA3hico PkUGavRk0MtWue5AbYjrszk+Z1ff+3Gjpb1euTybalE2r+3IxqrVe/k23Kdht9HhX3lQ cHGCdjApjD6gLmDF6PMXrYxilqHu1TQ/26uZ2oKCnet8SPdKEFT3Tc4FrKnTjbD2dE9Y CuQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PPKjU8hY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f59si21893979qtd.330.2019.10.24.03.27.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Oct 2019 03:27:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PPKjU8hY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNaKr-0002bP-SQ for patch@linaro.org; Thu, 24 Oct 2019 06:27:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54005) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNaGb-0002J4-QP for qemu-devel@nongnu.org; Thu, 24 Oct 2019 06:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNaGZ-00047Y-MN for qemu-devel@nongnu.org; Thu, 24 Oct 2019 06:22:53 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:37923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNaGZ-00047A-F5 for qemu-devel@nongnu.org; Thu, 24 Oct 2019 06:22:51 -0400 Received: by mail-wr1-x442.google.com with SMTP id v9so14154514wrq.5 for ; Thu, 24 Oct 2019 03:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O1yTnwnOMYBWFrsx8+srCnJtUFWB2Fa+51tIMG3xU7M=; b=PPKjU8hYkL1vSwylYwIcs0W+hmk9IcBpIas2Rd1UOTshioMck7W+YjB4YE7Rr+2/Zr 8nBJ1ZDHCvbXhmj6WcWoGiHKMl8oad2+q8RKJf0VIZoGfLRkvXi3wlVHc/r1szP4IeGl 6FGJWFEhnl+FZfTGfZhKQJO8cNyQBJTBTS0hYOMWkX0J0sDMzY+dA5Hpzc3QDCNrP5ef ESY1qXTFzXhC6InIqab3TBJ0zlQhFW98GDd4p2adGcPmGNX9ZtIpA1Wcy4OTgwxpyzIZ KKdmMgmQrqlLBLC3nZQtWzNjDQ1L0XnMNRIRqvRGRn5OdHX2bDTp/myDqEHhYKbnRxzR APsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O1yTnwnOMYBWFrsx8+srCnJtUFWB2Fa+51tIMG3xU7M=; b=JlG79gqriPzdjzQP9FQDN6GCQOxEdmyA+E6qj+/f9QUBOzhtiFrFy7Nqw9BJAC1nMG 5QugG75KWlNuy4Wr2OprDwGit4H46dBRE4Y0qLG1iHMCNigA3tQJBziq64D/TcmJLbnu 5ga2QC8JM0V1ITvjOkLnSsF1PGjxqz/9vax00JN6SdnwlHTzjcKZB2VtKk+bvfk2F6v+ 3pSVC2q1NVMLvkh6vzPlR3CcAg8GYJDGOgIoIYFkk6fS8yaROFbumiiAqplW2MVXFLWb 1tpDtyhLAUNTtngRGDiTbK9NTh7KfiUReuCicIX2SDL9IO46wzwUuekO0y8K05UR4dbV nIWA== X-Gm-Message-State: APjAAAXu090TwjDe+GpdOmO9g2qsk4A2mFgqQ5cSRGJ2p/zVNZIT0DSX NzqJvn5hIfZBssEiJjNt/mZ7JA== X-Received: by 2002:adf:9486:: with SMTP id 6mr3002278wrr.28.1571912570138; Thu, 24 Oct 2019 03:22:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l14sm9798596wrr.37.2019.10.24.03.22.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 03:22:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3FE8C1FF9A; Thu, 24 Oct 2019 11:22:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/17] tests/vm: netbsd autoinstall, using serial console Date: Thu, 24 Oct 2019 11:22:33 +0100 Message-Id: <20191024102240.2778-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191024102240.2778-1-alex.bennee@linaro.org> References: <20191024102240.2778-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Eduardo Habkost , stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Kamil Rytarowski , cota@braap.org, Gerd Hoffmann , stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, Kamil Rytarowski , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann 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 Reviewed-by: Kamil Rytarowski Tested-by: Thomas Huth [ehabkost: rebased to latest qemu.git master] Signed-off-by: Eduardo Habkost Message-Id: <20191018181705.17957-2-ehabkost@redhat.com> [AJB: add sha512sum, rm path check] Signed-off-by: Alex Bennée --- tests/vm/basevm.py | 10 ++- tests/vm/netbsd | 188 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 186 insertions(+), 12 deletions(-) -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index b5d1479bee9..4921e47f9f2 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -92,19 +92,25 @@ class BaseVM(object): logging.info("KVM not available, not using -enable-kvm") self._data_args = [] - def _download_with_cache(self, url, sha256sum=None): + def _download_with_cache(self, url, sha256sum=None, sha512sum=None): def check_sha256sum(fname): if not sha256sum: return True checksum = subprocess.check_output(["sha256sum", fname]).split()[0] return sha256sum == checksum.decode("utf-8") + def check_sha512sum(fname): + if not sha512sum: + return True + checksum = subprocess.check_output(["sha512sum", fname]).split()[0] + return sha512sum == checksum.decode("utf-8") + cache_dir = os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) fname = os.path.join(cache_dir, hashlib.sha1(url.encode("utf-8")).hexdigest()) - if os.path.exists(fname) and check_sha256sum(fname): + if os.path.exists(fname) and check_sha256sum(fname) and check_sha512sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) subprocess.check_call(["wget", "-c", url, "-O", fname + ".download"], diff --git a/tests/vm/netbsd b/tests/vm/netbsd index ee9eaeab504..9558a672efa 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 +# Gerd Hoffmann # # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. @@ -13,30 +14,197 @@ 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.1/images/NetBSD-8.1-amd64.iso" + csum = "718f275b7e0879599bdac95630c5e3f2184700032fdb6cdebf3bdd63687898c48ff3f08f57b89f4437a86cdd8ea07c01a39d432dbb37e1e4b008f4985f98da3f" + 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, sha512sum=self.csum) img_tmp = img + ".tmp" - sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) + iso = img + ".install.iso" + + self.print_step("Preparing iso and disk image") + subprocess.check_call(["ln", "-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 = [ + "-bios", "pc-bios/bios-256k.bin", + "-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() + os.rename(img_tmp, img) + os.remove(iso) + self.print_step("All done") if __name__ == "__main__": sys.exit(basevm.main(NetBSDVM))