From nobody Mon Feb 9 09:33:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619027184; cv=none; d=zohomail.com; s=zohoarc; b=m0+LgTYg1pQutMJITjDRsRDtn9EnLSl+3grfH1oikT2KWZQatFTntx1g3mcGjDvvlF/EFTVY8dN5mlm/7k5i0UqI8nmAuv0H7TxD4VWqlP6Q9carNIMJja37pQGJ/o5ydvPG2WpIZAPRCItw+XnBjvf1LPKvVZCLuH98mygAEUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619027184; h=Content-Type:Content-Transfer-Encoding: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=md56RVqrkvru1eSirIMb3jx38DNn+7pEvVDSJSXXGQU=; b=LbEHkrprQiMdWaK16atl6OmR+D2jT1Dcnq5TU+IvqUBf5CdkyF5/NSJLO38E9a7aV3VY8I9IIfOA+Zd9aIU5oup+yegEDtBENg9IG8BC/toqBZ/aJbuDbN+VMpvf7Ltp1pNQsiS/NIW+LxP6tFNPtasz8R3db2eRMpiOk8jExr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1619027184864209.0606514233359; Wed, 21 Apr 2021 10:46:24 -0700 (PDT) Received: from localhost ([::1]:45930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZGvf-0007Wt-SP for importer@patchew.org; Wed, 21 Apr 2021 13:46:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZGqq-0003qb-Ds for qemu-devel@nongnu.org; Wed, 21 Apr 2021 13:41:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38718) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZGqn-0007J1-Ej for qemu-devel@nongnu.org; Wed, 21 Apr 2021 13:41:23 -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-495-eabxj9pPNkmiYhyj3f621A-1; Wed, 21 Apr 2021 13:41:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D74C108BD0A; Wed, 21 Apr 2021 17:41:16 +0000 (UTC) Received: from laptop.redhat.com (ovpn-115-49.ams2.redhat.com [10.36.115.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDA7819D80; Wed, 21 Apr 2021 17:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619026879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=md56RVqrkvru1eSirIMb3jx38DNn+7pEvVDSJSXXGQU=; b=Ih10eqkJo73X1BNvYlztHEB6h7lVqovkzU++PKpL2xk3RmH5M/CE9Y/5Udkzday5ogSNhe +w2CnbHt/PlX3EyucCDfEH3gqV29FjoJNxlp3p0GxuiTt8e1Si/IWXFRSgZloVFm2kV3fr ifOxgAKI6IAWMIiQA+iZEafrFliGZY8= X-MC-Unique: eabxj9pPNkmiYhyj3f621A-1 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, philmd@redhat.com, peter.maydell@linaro.org, crosa@redhat.com, wainersm@redhat.com Subject: [PATCH v2 1/2] Acceptance Tests: Add default kernel params and pxeboot url to the KNOWN_DISTROS collection Date: Wed, 21 Apr 2021 19:40:57 +0200 Message-Id: <20210421174058.12201-2-eric.auger@redhat.com> In-Reply-To: <20210421174058.12201-1-eric.auger@redhat.com> References: <20210421174058.12201-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When running LinuxTests we may need to run the guest with custom params. It is practical to store the pxeboot URL and the default kernel params so that the tests just need to fetch those and augment the kernel params. Signed-off-by: Eric Auger --- tests/acceptance/avocado_qemu/__init__.py | 46 +++++++++++++++++++++-- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 6fd0016917..e6801102aa 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -1,6 +1,3 @@ -# Test class and utilities for functional tests -# -# Copyright (c) 2018 Red Hat, Inc. # # Author: # Cleber Rosa @@ -306,15 +303,50 @@ def ssh_command(self, command): 'x86_64': {'checksum': 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8f= c026954f3c5c27a0'}, 'aarch64': - {'checksum': '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5= 639c997fdf16fe49'}, + {'checksum': '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5= 639c997fdf16fe49', + 'pxeboot_url': "https://archives.fedoraproject.org/pub/archiv= e/fedora/" + "linux/releases/31/Everything/aarch64/os/image= s/pxeboot/", + 'kernel_params': "root=3DUUID=3Db6950a44-9f3c-4076-a9c2-355e8= 475b0a7 ro " + "earlyprintk=3Dpl011,0x9000000 ignore_loglev= el " + "no_timer_check printk.time=3D1 rd_NO_PLYMOU= TH " + "console=3DttyAMA0 "}, 'ppc64': {'checksum': '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390= dc4efa2026ad2f58'}, 's390x': {'checksum': '4caaab5a434fd4d1079149a072fdc7891e354f834d355069= ca982fdcaf5a122d'}, } + , + '32': { + 'aarch64': + { 'kernel_params': "root=3DUUID=3D3df75b65-be8d-4db4-8655-14d9= 5c0e90c5 ro " + "no_timer_check net.ifnames=3D0 console=3Dtt= y1 " + "console=3DttyS0,115200n8 ", + 'pxeboot_url': "https://ftp.lip6.fr/ftp/pub/linux/distribut= ions/fedora/releases/" + "32/Server/aarch64/os/images/pxeboot/"}, + } + , + '33': { + 'aarch64': + { 'kernel_params': "root=3DUUID=3Dd20b3ffa-6397-4a63-a734-1126= a0208f8a ro " + "no_timer_check net.ifnames=3D0 console=3Dtt= y1 " + "console=3DttyS0,115200n8 console=3Dtty0 ", + 'pxeboot_url': "https://ftp.lip6.fr/ftp/pub/linux/distribut= ions/fedora/releases/" + "33/Server/aarch64/os/images/pxeboot/"}, + } } } =20 +def get_known_distro_kernel_params(distro, distro_version, arch): + try: + return KNOWN_DISTROS.get(distro).get(distro_version).get(arch).get= ('kernel_params') + except AttributeError: + return None + +def get_known_distro_pxeboot_url(distro, distro_version, arch): + try: + return KNOWN_DISTROS.get(distro).get(distro_version).get(arch).get= ('pxeboot_url') + except AttributeError: + return None =20 def get_known_distro_checksum(distro, distro_version, arch): try: @@ -448,6 +480,12 @@ def set_up_cloudinit(self, ssh_pubkey=3DNone): cloudinit_iso =3D self.prepare_cloudinit(ssh_pubkey) self.vm.add_args('-drive', 'file=3D%s,format=3Draw' % cloudinit_is= o) =20 + def get_default_kernel_params(self): + return get_known_distro_kernel_params(self.distro, self.distro_ver= sion, self.arch) + + def get_pxeboot_url(self): + return get_known_distro_pxeboot_url(self.distro, self.distro_versi= on, self.arch) + def launch_and_wait(self, set_up_ssh_connection=3DTrue): self.vm.set_console() self.vm.launch() --=20 2.26.3