From nobody Sat May 18 14:01:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.66 as permitted sender) client-ip=209.85.208.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1603794090; cv=none; d=zohomail.com; s=zohoarc; b=jpSCI9u+6z0QE57683ANNdbmc/nxHOtdCS08v5K69h9vNobos25/dJsPUGyd5iJ4blr0OZEbL8ZpKjsjGF5YL7GUw+/rXpZMBs0NMuJ/7yrOId/fqnoPG8sQdjkGczCEG17d/pcP/ywgA+qgCNFABsV6KpDGBQdSGOxbOPavaUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603794090; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rtfnSQ41UqP2rpV3krqcrl9KAXpaVHu1NjKBUWp+JCo=; b=QG8ehEM1INSgHikqO4BUFB97GiFiWAQ+45Ls3if8lzWzxZtTv6tRk1nJancB8CDs5iPnv5H6HNvPH/Ct+2WSUMiSL6HkC9x0/XpwPchXdhFgNzKqTwHoK+X8WvSWx3phLNgYq+TkO4bvV6offsdkBkAnpWPHDxzr79k+xDCQWKU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by mx.zohomail.com with SMTPS id 1603794090819359.42347347866075; Tue, 27 Oct 2020 03:21:30 -0700 (PDT) Received: by mail-ed1-f66.google.com with SMTP id dn5so827517edb.10 for ; Tue, 27 Oct 2020 03:21:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id i3sm529029edd.75.2020.10.27.03.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 03:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rtfnSQ41UqP2rpV3krqcrl9KAXpaVHu1NjKBUWp+JCo=; b=gR/HQRczD/iPgSaDw4WGjlc3qt32ggngKg2uxvOEdg9IfVFR3UPGvrHKpr1x2z9fuN d8loIJDGEqpGLS5fO4v9uA+gVeyXfFtIj8wsUi5o5xR83mKZ7YrEau9Zb5HcMEjknM77 2QyS+NtSN/yf9n+Dj4FR1ZKTdM8RzQH6R7eg6XexXzgu+6w2B3xqrDieGiDjYctqPiNK EdjkV/fXixZFZoK3AyWjHJkrwAyV5ng6LsSX6kA6biUQjzJGjwmPZPZ6P82feNCZJJFc 5NeoMDTasz9x9ZEuVk/AwxKgCTlXTWE5pKG553sc6XdTUH//vLy8vtght+mWxZNiM2uX KSzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rtfnSQ41UqP2rpV3krqcrl9KAXpaVHu1NjKBUWp+JCo=; b=SfwJ80rbldYe0/Ns5NicAqLxpQDNG7DMnm6qwddt9nYg42CJe7/3Pnt1gKNK46VBz8 G2waMqNzCjH6yL5+3AJfRISGJIiErRAg0LeOfAJirCQEl9sw4xuwOl/mDiXzpbtXJOon dmPKWvlK/1wJsEh5dIIVnmmYNpEknW8+hDOiUtbyrhu0jTjsLp3AovDiBpZqG/A/8n5t nB3oDhvWjgkrEV6VsT+ZDJdvOdKZY/54jBa5bKlg+HQa4y0Ms5KltARig9ljUuU9S9Ve aVcEshW4JL6X0jVw70B+QSswJ8B7JVYbxiEWU6U6LTRv/4cfGgFJxAeooQsDnO9W4hw+ qm5Q== X-Gm-Message-State: AOAM530xswf9Puje6kDVFHnrB1B8KI10LcH7xsCCfs8KB8KogbNiCE6x H/gjqA0vxJcBCXoxU/2lkeNHy9wxJwE= X-Google-Smtp-Source: ABdhPJzLxqBvUUDkJ7BY9K4Jz2OqdEC2OBK7+VdAx+o4yELMnNN1z8YMOZtZQxSqSVWFrRYvQJlKrQ== X-Received: by 2002:a50:8f61:: with SMTP id 88mr1455434edy.175.1603794088897; Tue, 27 Oct 2020 03:21:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Alexander von Gluck IV , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v4 1/1] tests/vm: Add Haiku test based on their vagrant images Date: Tue, 27 Oct 2020 11:21:21 +0100 Message-Id: <20201027102121.264963-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201027102121.264963-1-f4bug@amsat.org> References: <20201027102121.264963-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Alexander von Gluck IV Signed-off-by: Alexander von Gluck IV [PMD: Avoid recreating the image each time] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/keys/vagrant | 27 +++++++++ tests/keys/vagrant.pub | 1 + tests/vm/Makefile.include | 3 +- tests/vm/basevm.py | 5 +- tests/vm/haiku.x86_64 | 116 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 tests/keys/vagrant create mode 100644 tests/keys/vagrant.pub create mode 100755 tests/vm/haiku.x86_64 diff --git a/tests/keys/vagrant b/tests/keys/vagrant new file mode 100644 index 00000000000..7d6a083909e --- /dev/null +++ b/tests/keys/vagrant @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI +w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP +kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2 +hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO +Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW +yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd +ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1 +Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf +TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK +iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A +sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf +4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP +cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk +EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN +CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX +3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG +YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj +3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+ +dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz +6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC +P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF +llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ +kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH ++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ +NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=3D +-----END RSA PRIVATE KEY----- diff --git a/tests/keys/vagrant.pub b/tests/keys/vagrant.pub new file mode 100644 index 00000000000..b8d012d787f --- /dev/null +++ b/tests/keys/vagrant.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4= TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPk= cmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUec= p4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdET= k1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c= 9WhQ=3D=3D well-known vagrant key for qemu-test, do not use on any machine = exposed to an external network diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 61f893ffdc0..e94d95ec541 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -4,7 +4,7 @@ =20 EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) =20 -IMAGES :=3D freebsd netbsd openbsd centos fedora +IMAGES :=3D freebsd netbsd openbsd centos fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) IMAGES +=3D ubuntu.i386 centos ifneq ($(EFI_AARCH64),) @@ -41,6 +41,7 @@ endif else @echo " (install genisoimage to build centos/ubuntu images)" endif + @echo " vm-build-haiku.x86_64 - Build QEMU in Haiku VM" @echo "" @echo " vm-build-all - Build QEMU in all VMs" @echo " vm-clean-all - Clean up VM images" diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 3fac20e929a..00f1d5ca8da 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -44,6 +44,7 @@ 'machine' : 'pc', 'guest_user' : "qemu", 'guest_pass' : "qemupass", + 'root_user' : "root", 'root_pass' : "qemupass", 'ssh_key_file' : SSH_KEY_FILE, 'ssh_pub_key_file': SSH_PUB_KEY_FILE, @@ -245,13 +246,13 @@ def ssh(self, *cmd): return self._ssh_do(self._config["guest_user"], cmd, False) =20 def ssh_root(self, *cmd): - return self._ssh_do("root", cmd, False) + return self._ssh_do(self._config["root_user"], cmd, False) =20 def ssh_check(self, *cmd): self._ssh_do(self._config["guest_user"], cmd, True) =20 def ssh_root_check(self, *cmd): - self._ssh_do("root", cmd, True) + self._ssh_do(self._config["root_user"], cmd, True) =20 def build_image(self, img): raise NotImplementedError diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 new file mode 100755 index 00000000000..634ef774870 --- /dev/null +++ b/tests/vm/haiku.x86_64 @@ -0,0 +1,116 @@ +#!/usr/bin/env python3 +# +# Haiku VM image +# +# Copyright 2020 Haiku, Inc. +# +# Authors: +# Alexander von Gluck IV +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. +# + +import os +import re +import sys +import time +import socket +import subprocess +import basevm + +VAGRANT_KEY_FILE =3D os.path.join(os.path.dirname(__file__), + "..", "keys", "vagrant") + +VAGRANT_PUB_KEY_FILE =3D os.path.join(os.path.dirname(__file__), + "..", "keys", "vagrant.pub") + +HAIKU_CONFIG =3D { + 'cpu' : "max", + 'machine' : 'pc', + 'guest_user' : "vagrant", + 'guest_pass' : "", + 'root_user' : "vagrant", + 'root_pass' : "", + 'ssh_key_file' : VAGRANT_KEY_FILE, + 'ssh_pub_key_file': VAGRANT_PUB_KEY_FILE, + 'memory' : "4G", + 'extra_args' : [], + 'qemu_args' : "-device VGA", + 'dns' : "", + 'ssh_port' : 0, + 'install_cmds' : "", + 'boot_dev_type' : "block", + 'ssh_timeout' : 1, +} + +class HaikuVM(basevm.BaseVM): + name =3D "haiku" + arch =3D "x86_64" + + link =3D "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/vers= ions/20200702/providers/libvirt.box" + csum =3D "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e= 68d5" + + poweroff =3D "shutdown" + + requirements =3D [ + "devel:libbz2", + "devel:libcapstone", + "devel:libcurl", + "devel:libfdt", + "devel:libgcrypt", + "devel:libgl", + "devel:libglib_2.0", + "devel:libgnutls", + "devel:libgpg_error", + "devel:libintl", + "devel:libjpeg", + "devel:liblzo2", + "devel:libncursesw", + "devel:libnettle", + "devel:libpixman_1", + "devel:libpng16", + "devel:libsdl2_2.0", + "devel:libsnappy", + "devel:libssh2", + "devel:libtasn1", + "devel:libusb_1.0", + "devel:libz", + "setuptools_python3" + ] + + # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (re= versed order) + BUILD_SCRIPT =3D """ + set -e; + rm -rf /tmp/qemu-test.* + cd $(mktemp -d /tmp/qemu-test.XXXXXX); + mkdir src build; cd src; + tar -xf /dev/disk/virtual/virtio_block/0/raw; + cd ../build + ../src/configure --python=3Dpython3 {configure_opts}; + make --output-sync -j{jobs} {target} {verbose}; + """ + + def build_image(self, img): + self.print_step("Downloading disk image") + tarball =3D self._download_with_cache(self.link, sha256sum=3Dself.= csum) + + self.print_step("Extracting disk image") + + subprocess.check_call(["tar", "xzf", tarball, "./box.img", "-O"], + stdout=3Dopen(img, 'wb')) + + self.print_step("Preparing disk image") + self.boot(img) + + # Wait for ssh to be available. + self.wait_ssh(wait_root=3DTrue, cmd=3D"exit 0") + + # Install packages + self.ssh_root("pkgman install -y %s" % " ".join(self.requirements)) + self.graceful_shutdown() + + self.print_step("All done") + +if __name__ =3D=3D "__main__": + sys.exit(basevm.main(HaikuVM, config=3DHAIKU_CONFIG)) --=20 2.26.2