From nobody Mon Apr 29 01:21:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584454854; cv=none; d=zohomail.com; s=zohoarc; b=X2wp/jRZp9d4jdeErVHBKtXXMVdG1Yuwd7D4TyILlZeSFqBPLx18x6fFaP/H9kZj/wGaHmPGaKD7IjD5eErqG0pobb8MbzIkxipEg1W86XprkxTpX5wB2VdZ0QAMmzEBl97hSjTnA2tNWGlIIQXOfQFxApNyAEHwClDJnsl8OK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584454854; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OJ6N3ZIGpEi4htj+IIYiXAxC4McwXmKYBpZAwEc7nAo=; b=MqzRPf2kue4b7ETkrZRvDF7YlSO14wEDs4Heey58p8PSjK3acoyanlHsRDws8CUuU5gocGUPMkRrYFjMWRBu1XykK+Cml8p035pUy7ey/t7NLSMBjeZLF2Sx6XNVOft9LVJO4eqCIwpEY71zJCvtjW4I5G+qjuLtRrXr/CJrBK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584454854603626.0776700715768; Tue, 17 Mar 2020 07:20:54 -0700 (PDT) Received: from localhost ([::1]:33626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jED5R-0007iR-FU for importer@patchew.org; Tue, 17 Mar 2020 10:20:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55941) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jED1s-0001J1-Fs for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jED1q-0007q4-V2 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:12 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:22902) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jED1q-0007md-P4 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:10 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-52-bkwBeFwZOcC9LMn5dXpQLA-1; Tue, 17 Mar 2020 10:17:08 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 401D418A6EC6; Tue, 17 Mar 2020 14:17:05 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-2.rdu2.redhat.com [10.10.117.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 04ADF73873; Tue, 17 Mar 2020 14:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584454630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OJ6N3ZIGpEi4htj+IIYiXAxC4McwXmKYBpZAwEc7nAo=; b=iGfD+14jo+k3+JsGvMEvhu5zCmW1QsXhwh5D86iXi3GbEUG+ISlaLUlcGu+Q597B0Yh9Zs p/Hir7CEhVR2XQ17Ykvgg0n7YbVts1TmujNg9GhcHg0IyXC8r1LDaVgqxGJWi7ZTM7M6f3 2KKeegE9tP2lbpDFm+eFScmFt/maApg= X-MC-Unique: bkwBeFwZOcC9LMn5dXpQLA-1 From: Cleber Rosa To: qemu-devel@nongnu.org Subject: [PATCH v10 1/3] Acceptance tests: introduce BUILD_DIR and SOURCE_DIR Date: Tue, 17 Mar 2020 10:16:52 -0400 Message-Id: <20200317141654.29355-2-crosa@redhat.com> In-Reply-To: <20200317141654.29355-1-crosa@redhat.com> References: <20200317141654.29355-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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 Zheng , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Some tests may benefit from using resources from a build directory. This introduces three variables that can help tests find resources in those directories. First, a BUILD_DIR is assumed to exist, given that the primary form of running the acceptance tests is from a build directory (which may or may not be the same as the source tree, that is, the SOURCE_DIR). If the directory containing the acceptance tests happens to be a link to a directory, it's assumed to it points to the source tree (SOURCE_DIR), which is the behavior defined on the QEMU Makefiles. If the directory containing the acceptance tests is not a link, then a in-tree build is assumed, and the BUILD_DIR and SOURCE_DIR have the same value. Signed-off-by: Cleber Rosa Reviewed-by: Wainer dos Santos Moschetta Tested-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Tested-by: Willian Rampazzo --- tests/acceptance/avocado_qemu/__init__.py | 25 +++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index d4358eb431..59e7b4f763 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -16,8 +16,21 @@ import tempfile =20 import avocado =20 -SRC_ROOT_DIR =3D os.path.join(os.path.dirname(__file__), '..', '..', '..') -sys.path.append(os.path.join(SRC_ROOT_DIR, 'python')) +#: The QEMU build root directory. It may also be the source directory +#: if building from the source dir, but it's safer to use BUILD_DIR for +#: that purpose. Be aware that if this code is moved outside of a source +#: and build tree, it will not be accurate. +BUILD_DIR =3D os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirn= ame(__file__)))) + +if os.path.islink(os.path.dirname(os.path.dirname(__file__))): + # The link to the acceptance tests dir in the source code directory + lnk =3D os.path.dirname(os.path.dirname(__file__)) + #: The QEMU root source directory + SOURCE_DIR =3D os.path.dirname(os.path.dirname(os.readlink(lnk))) +else: + SOURCE_DIR =3D BUILD_DIR + +sys.path.append(os.path.join(SOURCE_DIR, 'python')) =20 from qemu.machine import QEMUMachine =20 @@ -49,10 +62,10 @@ def pick_default_qemu_bin(arch=3DNone): if is_readable_executable_file(qemu_bin_relative_path): return qemu_bin_relative_path =20 - qemu_bin_from_src_dir_path =3D os.path.join(SRC_ROOT_DIR, + qemu_bin_from_bld_dir_path =3D os.path.join(BUILD_DIR, qemu_bin_relative_path) - if is_readable_executable_file(qemu_bin_from_src_dir_path): - return qemu_bin_from_src_dir_path + if is_readable_executable_file(qemu_bin_from_bld_dir_path): + return qemu_bin_from_bld_dir_path =20 =20 def _console_interaction(test, success_message, failure_message, @@ -153,7 +166,7 @@ class Test(avocado.Test): self.qemu_bin =3D self.params.get('qemu_bin', default=3Ddefault_qemu_bin) if self.qemu_bin is None: - self.cancel("No QEMU binary defined or found in the source tre= e") + self.cancel("No QEMU binary defined or found in the build tree= ") =20 def _new_vm(self, *args): vm =3D QEMUMachine(self.qemu_bin, sock_dir=3Dtempfile.mkdtemp()) --=20 2.25.1 From nobody Mon Apr 29 01:21:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584454952; cv=none; d=zohomail.com; s=zohoarc; b=myoicqvf3oCG7xfEcI61l4URoDBWsCpgfm7XouBBxVHVlodQoff/EZmyexa6nWYAYol50xyZ+j7E3L9GToNbwZW8F6vDAY5KjeDGaX0uAMikDcUkrPO1f1YpKHxGcRepO2I/mY13klHcKIcRjTRZMkUBSDWdKdnD+tin39yeNRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584454952; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wNFBpbXbFpO/qXVt2xjxYy5/DJQhb9zFt6vZXxcFoY8=; b=AAJa0NwCBSQd7lNgPwp3rFf+euZm9/v/f8e8Nb3oXroRXllT4DDu77Qb/x4sIgTTON/TJDnyhpeNLbxrAzSw+Yyq/4lclCtYB/4r++/dFxwsKMGyUua3s9+b7b1RTks7R38DQEYyVcRhCI53sZvkP4hZlvXP/PAC+YNqezeCEpI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584454952053905.7621585589504; Tue, 17 Mar 2020 07:22:32 -0700 (PDT) Received: from localhost ([::1]:33654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jED70-0001aP-QJ for importer@patchew.org; Tue, 17 Mar 2020 10:22:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56045) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jED20-0001PQ-HA for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jED1y-0008O0-Go for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:20 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:37234) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jED1y-0008Kz-Bh for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:18 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-104-y1Fn8mdhOXqS4iu1I9p_Og-1; Tue, 17 Mar 2020 10:17:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8F89107ACC9; Tue, 17 Mar 2020 14:17:06 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-2.rdu2.redhat.com [10.10.117.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C36E73873; Tue, 17 Mar 2020 14:17:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584454635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wNFBpbXbFpO/qXVt2xjxYy5/DJQhb9zFt6vZXxcFoY8=; b=Dcy1kt5m4FOfRDeeA3BXvA9uPzRx7LeWwWmixjRq+YmtV5DyysFtKdnlN5mv+Yaf2Yz7OP uu+ozLXFqcDdG9D35jnueQQ40bk7E5dVkzDyU3JZFQF12mp6dRtznXuZv5aO3jP16S4UDa QcjS5VC4kPUjSLVQNsQNqAFjCEwbLyM= X-MC-Unique: y1Fn8mdhOXqS4iu1I9p_Og-1 From: Cleber Rosa To: qemu-devel@nongnu.org Subject: [PATCH v10 2/3] Acceptance test: add "boot_linux" tests Date: Tue, 17 Mar 2020 10:16:53 -0400 Message-Id: <20200317141654.29355-3-crosa@redhat.com> In-Reply-To: <20200317141654.29355-1-crosa@redhat.com> References: <20200317141654.29355-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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 Zheng , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This acceptance test, validates that a full blown Linux guest can successfully boot in QEMU. In this specific case, the guest chosen is Fedora version 31. * x86_64, pc-i440fx and pc-q35 machine types, with TCG and KVM as accelerators * aarch64 and virt machine type, with TCG and KVM as accelerators * ppc64 and pseries machine type with TCG as accelerator * s390x and s390-ccw-virtio machine type with TCG as accelerator The Avocado vmimage utils library is used to download and cache the Linux guest images, and from those images a snapshot image is created and given to QEMU. If a qemu-img binary is available in the build directory, it's used to create the snapshot image, so that matching qemu-system-* and qemu-img are used in the same test run. If qemu-img is not available in the build tree, one is attempted to be found installed system-wide (in the $PATH). If qemu-img is not found in the build dir or in the $PATH, the test is canceled. The method for checking the successful boot is based on "cloudinit" and its "phone home" feature. The guest is given an ISO image with the location of the phone home server, and the information to post (the instance ID). Upon receiving the correct information, from the guest, the test is considered to have PASSed. This test is currently limited to user mode networking only, and instructs the guest to connect to the "router" address that is hard coded in QEMU. To create the cloudinit ISO image that will be used to configure the guest, the pycdlib library is also required and has been added as requirement to the virtual environment created by "check-venv". The console output is read by a separate thread, by means of the Avocado datadrainer utility module. Signed-off-by: Cleber Rosa Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Tested-by: Willian Rampazzo --- .travis.yml | 2 +- tests/acceptance/boot_linux.py | 222 +++++++++++++++++++++++++++++++++ tests/requirements.txt | 1 + 3 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 tests/acceptance/boot_linux.py diff --git a/.travis.yml b/.travis.yml index b92798ac3b..c460059a7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -315,7 +315,7 @@ jobs: - name: "GCC check-acceptance" dist: bionic env: - - CONFIG=3D"--target-list=3Daarch64-softmmu,alpha-softmmu,arm-soft= mmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-sof= tmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86= _64-softmmu,xtensa-softmmu" + - CONFIG=3D"--enable-tools --target-list=3Daarch64-softmmu,alpha-s= oftmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-so= ftmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sp= arc-softmmu,x86_64-softmmu,xtensa-softmmu" - TEST_CMD=3D"make check-acceptance" after_script: - python3 -c 'import json; r =3D json.load(open("tests/results/lat= est/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"= ] not in ("PASS", "SKIP")]' | xargs cat diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py new file mode 100644 index 0000000000..075a386300 --- /dev/null +++ b/tests/acceptance/boot_linux.py @@ -0,0 +1,222 @@ +# Functional test that boots a complete Linux system via a cloud image +# +# Copyright (c) 2018-2020 Red Hat, Inc. +# +# Author: +# Cleber Rosa +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import os + +from avocado_qemu import Test, BUILD_DIR + +from qemu.accel import kvm_available +from qemu.accel import tcg_available + +from avocado.utils import cloudinit +from avocado.utils import network +from avocado.utils import vmimage +from avocado.utils import datadrainer +from avocado.utils.path import find_command + +ACCEL_NOT_AVAILABLE_FMT =3D "%s accelerator does not seem to be available" +KVM_NOT_AVAILABLE =3D ACCEL_NOT_AVAILABLE_FMT % "KVM" +TCG_NOT_AVAILABLE =3D ACCEL_NOT_AVAILABLE_FMT % "TCG" + + +class BootLinux(Test): + """ + Boots a Linux system, checking for a successful initialization + """ + + timeout =3D 900 + chksum =3D None + + def setUp(self): + super(BootLinux, self).setUp() + self.vm.add_args('-smp', '2') + self.vm.add_args('-m', '1024') + self.prepare_boot() + self.prepare_cloudinit() + + def prepare_boot(self): + self.log.debug('Looking for and selecting a qemu-img binary to be ' + 'used to create the bootable snapshot image') + # If qemu-img has been built, use it, otherwise the system wide one + # will be used. If none is available, the test will cancel. + qemu_img =3D os.path.join(BUILD_DIR, 'qemu-img') + if not os.path.exists(qemu_img): + qemu_img =3D find_command('qemu-img', False) + if qemu_img is False: + self.cancel('Could not find "qemu-img", which is required to ' + 'create the bootable image') + vmimage.QEMU_IMG =3D qemu_img + + self.log.info('Downloading/preparing boot image') + # Fedora 31 only provides ppc64le images + image_arch =3D self.arch + if image_arch =3D=3D 'ppc64': + image_arch =3D 'ppc64le' + try: + self.boot =3D vmimage.get( + 'fedora', arch=3Dimage_arch, version=3D'31', + checksum=3Dself.chksum, + algorithm=3D'sha256', + cache_dir=3Dself.cache_dirs[0], + snapshot_dir=3Dself.workdir) + self.vm.add_args('-drive', 'file=3D%s' % self.boot.path) + except: + self.cancel('Failed to download/prepare boot image') + + def prepare_cloudinit(self): + self.log.info('Preparing cloudinit image') + try: + cloudinit_iso =3D os.path.join(self.workdir, 'cloudinit.iso') + self.phone_home_port =3D network.find_free_port() + cloudinit.iso(cloudinit_iso, self.name, + username=3D'root', + password=3D'password', + # QEMU's hard coded usermode router address + phone_home_host=3D'10.0.2.2', + phone_home_port=3Dself.phone_home_port) + self.vm.add_args('-drive', 'file=3D%s,format=3Draw' % cloudini= t_iso) + except Exception: + self.cancel('Failed to prepared cloudinit image') + + def launch_and_wait(self): + self.vm.set_console() + self.vm.launch() + console_drainer =3D datadrainer.LineLogger(self.vm.console_socket.= fileno(), + logger=3Dself.log.getChil= d('console')) + console_drainer.start() + self.log.info('VM launched, waiting for boot confirmation from gue= st') + cloudinit.wait_for_phone_home(('0.0.0.0', self.phone_home_port), s= elf.name) + + +class BootLinuxX8664(BootLinux): + """ + :avocado: tags=3Darch:x86_64 + """ + + chksum =3D 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c= 5c27a0' + + def test_pc_i440fx_tcg(self): + """ + :avocado: tags=3Dmachine:pc + :avocado: tags=3Daccel:tcg + """ + if not tcg_available(self.qemu_bin): + self.cancel(TCG_NOT_AVAILABLE) + self.vm.add_args("-accel", "tcg") + self.launch_and_wait() + + def test_pc_i440fx_kvm(self): + """ + :avocado: tags=3Dmachine:pc + :avocado: tags=3Daccel:kvm + """ + if not kvm_available(self.arch, self.qemu_bin): + self.cancel(KVM_NOT_AVAILABLE) + self.vm.add_args("-accel", "kvm") + self.launch_and_wait() + + def test_pc_q35_tcg(self): + """ + :avocado: tags=3Dmachine:q35 + :avocado: tags=3Daccel:tcg + """ + if not tcg_available(self.qemu_bin): + self.cancel(TCG_NOT_AVAILABLE) + self.vm.add_args("-accel", "tcg") + self.launch_and_wait() + + def test_pc_q35_kvm(self): + """ + :avocado: tags=3Dmachine:q35 + :avocado: tags=3Daccel:kvm + """ + if not kvm_available(self.arch, self.qemu_bin): + self.cancel(KVM_NOT_AVAILABLE) + self.vm.add_args("-accel", "kvm") + self.launch_and_wait() + + +class BootLinuxAarch64(BootLinux): + """ + :avocado: tags=3Darch:aarch64 + :avocado: tags=3Dmachine:virt + :avocado: tags=3Dmachine:gic-version=3D2 + """ + + chksum =3D '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf= 16fe49' + + def add_common_args(self): + self.vm.add_args('-bios', + os.path.join(BUILD_DIR, 'pc-bios', + 'edk2-aarch64-code.fd')) + self.vm.add_args('-device', 'virtio-rng-pci,rng=3Drng0') + self.vm.add_args('-object', 'rng-random,id=3Drng0,filename=3D/dev/= urandom') + + def test_virt_tcg(self): + """ + :avocado: tags=3Daccel:tcg + :avocado: tags=3Dcpu:max + """ + if not tcg_available(self.qemu_bin): + self.cancel(TCG_NOT_AVAILABLE) + self.vm.add_args("-accel", "tcg") + self.vm.add_args("-cpu", "max") + self.vm.add_args("-machine", "virt,gic-version=3D2") + self.add_common_args() + self.launch_and_wait() + + def test_virt_kvm(self): + """ + :avocado: tags=3Daccel:kvm + :avocado: tags=3Dcpu:host + """ + if not kvm_available(self.arch, self.qemu_bin): + self.cancel(KVM_NOT_AVAILABLE) + self.vm.add_args("-accel", "kvm") + self.vm.add_args("-cpu", "host") + self.vm.add_args("-machine", "virt,gic-version=3D2") + self.add_common_args() + self.launch_and_wait() + + +class BootLinuxPPC64(BootLinux): + """ + :avocado: tags=3Darch:ppc64 + """ + + chksum =3D '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026= ad2f58' + + def test_pseries_tcg(self): + """ + :avocado: tags=3Dmachine:pseries + :avocado: tags=3Daccel:tcg + """ + if not tcg_available(self.qemu_bin): + self.cancel(TCG_NOT_AVAILABLE) + self.vm.add_args("-accel", "tcg") + self.launch_and_wait() + + +class BootLinuxS390X(BootLinux): + """ + :avocado: tags=3Darch:s390x + """ + + chksum =3D '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf= 5a122d' + + def test_s390_ccw_virtio_tcg(self): + """ + :avocado: tags=3Dmachine:s390-ccw-virtio + :avocado: tags=3Daccel:tcg + """ + if not tcg_available(self.qemu_bin): + self.cancel(TCG_NOT_AVAILABLE) + self.vm.add_args("-accel", "tcg") + self.launch_and_wait() diff --git a/tests/requirements.txt b/tests/requirements.txt index f4f1736a08..f9c84b4ba1 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -2,3 +2,4 @@ # in the tests/venv Python virtual environment. For more info, # refer to: https://pip.pypa.io/en/stable/user_guide/#id1 avocado-framework=3D=3D76.0 +pycdlib=3D=3D1.9.0 --=20 2.25.1 From nobody Mon Apr 29 01:21:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584454853; cv=none; d=zohomail.com; s=zohoarc; b=YxR9614TKnU50a8nFjVPfhqyQaL5ymi/bHFFqc5+lCv8iUy26plMLh8qK2K7F6CWzJYo0VQjYsAm7mfjaU+PGUdN/iA8Wy8Sc99htKHdNjaxrFF62y98lVgvOobN10yoa2HcgS6+x6KtFWCCrKBQaeweCwvdSKhCUM/7ic5elMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584454853; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nVKMcGxmP8PU2vpAgDPmZ12PJSUYbLXimE6E8kXTmQA=; b=X7eAVZCqXjPectOK83PseRGiLdh3UuUoA0E/QEcnPzBVuX3zTB87eJZ4mg4IID1VVQsXBPUPoLAyZS4qnS/hFhfJZoTQZgCTNo5SNuDzbHqhAik9T2fPKf4hTbJ6ZfQRFmXEu5P03Yoof2TUWUZUVV142+qlywsdQhg8LQeQPCk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158445485350576.17081485966685; Tue, 17 Mar 2020 07:20:53 -0700 (PDT) Received: from localhost ([::1]:33624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jED5O-0007cv-W8 for importer@patchew.org; Tue, 17 Mar 2020 10:20:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55960) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jED1t-0001K0-2H for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jED1r-0007yC-OU for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:12 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:47035) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jED1r-0007vj-K7 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 10:17:11 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-309-vza3d_XjM72djl1lhwKhaA-1; Tue, 17 Mar 2020 10:17:09 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3BDBD1005F6F; Tue, 17 Mar 2020 14:17:08 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-2.rdu2.redhat.com [10.10.117.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8EA473873; Tue, 17 Mar 2020 14:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584454631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nVKMcGxmP8PU2vpAgDPmZ12PJSUYbLXimE6E8kXTmQA=; b=HgFcgX0GMoghTF1fBqHH0Zlt9qgzES4sUeAXQMkQC8vgjIArvS3vWxmexhz+Oocp8bCUHy hrMGkwvRoZVMkZepMFHMfsw9JTOe2QQmhdKN/r+SPexoWEimmertHt09gmiZdyqhXeBb4w PGJ4Wqn1GlOEte1i2zqTE5rWOo1Z9Gw= X-MC-Unique: vza3d_XjM72djl1lhwKhaA-1 From: Cleber Rosa To: qemu-devel@nongnu.org Subject: [PATCH v10 3/3] Acceptance tests: add make targets to download images Date: Tue, 17 Mar 2020 10:16:54 -0400 Message-Id: <20200317141654.29355-4-crosa@redhat.com> In-Reply-To: <20200317141654.29355-1-crosa@redhat.com> References: <20200317141654.29355-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 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 Zheng , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The newly introduced "boot linux" tests make use of Linux images that are larger than usual, and fall into what Avocado calls "vmimages", and can be referred to by name, version and architecture. The images can be downloaded automatically during the test. But, to make for more reliable test results, this introduces a target that will download the vmimages for the architectures that have been configured and are available for the currently used distro (Fedora 31). Signed-off-by: Cleber Rosa Reviewed-by: Willian Rampazzo Reviewed-by: Alex Benn=C3=A9e Tested-by: Willian Rampazzo --- tests/Makefile.include | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 67e8fcddda..9c19229a06 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -20,6 +20,8 @@ check-help: @echo " $(MAKE) check-venv Creates a Python venv for tests" @echo " $(MAKE) check-clean Clean the tests and related data" @echo + @echo " $(MAKE) get-vm-images Downloads all images used by accepta= nce tests, according to configured targets (~350 MB each, 1.5 GB max)" + @echo @echo @echo "The variable SPEED can be set to control the gtester speed setting= ." @echo "Default options are -k and (for $(MAKE) V=3D1) --verbose; they can= be" @@ -889,7 +891,20 @@ $(TESTS_RESULTS_DIR): =20 check-venv: $(TESTS_VENV_DIR) =20 -check-acceptance: check-venv $(TESTS_RESULTS_DIR) +FEDORA_31_ARCHES_CANDIDATES=3D$(patsubst ppc64,ppc64le,$(TARGETS)) +FEDORA_31_ARCHES :=3D x86_64 aarch64 ppc64le s390x +FEDORA_31_DOWNLOAD=3D$(filter $(FEDORA_31_ARCHES),$(FEDORA_31_ARCHES_CANDI= DATES)) + +# download one specific Fedora 31 image +get-vm-image-fedora-31-%: $(check-venv) + $(call quiet-command, \ + $(TESTS_VENV_DIR)/bin/python -m avocado vmimage get \ + --distro=3Dfedora --distro-version=3D31 --arch=3D$*) + +# download all vm images, according to defined targets +get-vm-images: $(check-venv) $(patsubst %,get-vm-image-fedora-31-%, $(FEDO= RA_31_DOWNLOAD)) + +check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images $(call quiet-command, \ $(TESTS_VENV_DIR)/bin/python -m avocado \ --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ @@ -900,7 +915,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) =20 # Consolidated targets =20 -.PHONY: check-block check-qapi-schema check-qtest check-unit check check-c= lean +.PHONY: check-block check-qapi-schema check-qtest check-unit check check-c= lean get-vm-images check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schem= a/doc-good.texi check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) ifeq ($(CONFIG_TOOLS),y) --=20 2.25.1