From nobody Fri Apr 4 21:12:24 2025 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=1739277202; cv=none; d=zohomail.com; s=zohoarc; b=X+3ADWGQgU/cnwX0mE4s4LQNEbXmX5a688fL4M4/mF1YmZ+iJIF9omz16Bk3N0M4iNFnxXG9XtR4/hdRrqiYDO5Nv32McHH7PPoKXY85HE1D+Ngze3Ts1AHRbLEyPPTHGuPGgEWD9H/WPcPsIfPjqxlQ5Sc9AV4juphH1T+9dJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739277202; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=e3T6LDkacyjUlecTplhH/SuS4x4FyNZiKYLWy2If9XQ=; b=IgC9j0NkYKawaCmA93/rxJs499HsqAdcU7iqMw6cXvycR4GeIXexPuTXR3ADwP978izpN/Yxvum7uRf0zZvmJNSTkcGbGbZB8P4oMIrjIsgsBuVGtoztf7aZzzn3n6YRZmYgueZ/gcqoyi8NTWo9o8QIvJEjJsOWmD1ew0VZY7E= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739277202200399.3361173633109; Tue, 11 Feb 2025 04:33:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thpQn-0005eZ-9s; Tue, 11 Feb 2025 07:32:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQk-0005dF-Qw for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:31:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQi-0000Gh-AG for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:31:58 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-266-Ls33FqAMPNmyc4ZKvrjLnA-1; Tue, 11 Feb 2025 07:31:51 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5560C180034A; Tue, 11 Feb 2025 12:31:50 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.52]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F1DB119560A3; Tue, 11 Feb 2025 12:31:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739277115; 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=e3T6LDkacyjUlecTplhH/SuS4x4FyNZiKYLWy2If9XQ=; b=ceYwz4A5i86bzW2gcRLdClxuAWHUNjIqFK7w1Paxhdh1GfS9k03OzzAJR/S22EhwQCZjkE LmlHERt72wPGNQmnP4KRzpbX88a/SQbdFcOb7nDujzV890/DSui7kgh/p12RGzibW9fIDf EqSjRggfZnljf+YohjdDgjcYyzVr258= X-MC-Unique: Ls33FqAMPNmyc4ZKvrjLnA-1 X-Mimecast-MFC-AGG-ID: Ls33FqAMPNmyc4ZKvrjLnA From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 1/7] tests/functional: Convert the aarch64 xen test to the functional framework Date: Tue, 11 Feb 2025 13:31:38 +0100 Message-ID: <20250211123144.37617-2-thuth@redhat.com> In-Reply-To: <20250211123144.37617-1-thuth@redhat.com> References: <20250211123144.37617-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739277203986019100 This test just needs the adaption for the asset handling, then we can move it to the functional framework. Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Message-ID: <20250207144409.220006-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- tests/avocado/boot_xen.py | 95 ---------------------------- tests/functional/meson.build | 1 + tests/functional/test_aarch64_xen.py | 90 ++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 96 deletions(-) delete mode 100644 tests/avocado/boot_xen.py create mode 100755 tests/functional/test_aarch64_xen.py diff --git a/MAINTAINERS b/MAINTAINERS index fefabe0cee..ebb415bc40 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2539,7 +2539,7 @@ M: Alex Benn=C3=A9e S: Maintained F: hw/core/guest-loader.c F: docs/system/guest-loader.rst -F: tests/avocado/boot_xen.py +F: tests/functional/test_aarch64_xen.py =20 Intel Hexadecimal Object File Loader M: Su Hang diff --git a/tests/avocado/boot_xen.py b/tests/avocado/boot_xen.py deleted file mode 100644 index 490a127a3e..0000000000 --- a/tests/avocado/boot_xen.py +++ /dev/null @@ -1,95 +0,0 @@ -# Functional test that boots a Xen hypervisor with a domU kernel and -# checks the console output is vaguely sane . -# -# Copyright (c) 2020 Linaro -# -# Author: -# Alex Benn=C3=A9e -# -# SPDX-License-Identifier: GPL-2.0-or-later -# -# 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 wait_for_console_pattern -from boot_linux_console import LinuxKernelTest - - -class BootXen(LinuxKernelTest): - """ - Boots a Xen hypervisor with a Linux DomU kernel. - - :avocado: tags=3Darch:aarch64 - :avocado: tags=3Daccel:tcg - :avocado: tags=3Dcpu:cortex-a57 - :avocado: tags=3Dmachine:virt - """ - - timeout =3D 90 - XEN_COMMON_COMMAND_LINE =3D 'dom0_mem=3D128M loglvl=3Dall guest_loglvl= =3Dall' - - def setUp(self): - super(BootXen, self).setUp() - - # Using my own built kernel - which works - kernel_url =3D ('https://fileserver.linaro.org/' - 's/JSsewXGZ6mqxPr5/download?path=3D%2F&files=3D' - 'linux-5.9.9-arm64-ajb') - kernel_sha1 =3D '4f92bc4b9f88d5ab792fa7a43a68555d344e1b83' - self.kernel_path =3D self.fetch_asset(kernel_url, - asset_hash=3Dkernel_sha1) - - def launch_xen(self, xen_path): - """ - Launch Xen with a dom0 guest kernel - """ - self.log.info("launch with xen_path: %s", xen_path) - - self.vm.set_console() - - self.vm.add_args('-machine', 'virtualization=3Don', - '-m', '768', - '-kernel', xen_path, - '-append', self.XEN_COMMON_COMMAND_LINE, - '-device', - 'guest-loader,addr=3D0x47000000,kernel=3D%s,boota= rgs=3Dconsole=3Dhvc0' - % (self.kernel_path)) - - self.vm.launch() - - console_pattern =3D 'VFS: Cannot open root device' - wait_for_console_pattern(self, console_pattern, "Panic on CPU 0:") - - def test_arm64_xen_411_and_dom0(self): - # archive of file from https://deb.debian.org/debian/pool/main/x/x= en/ - xen_url =3D ('https://fileserver.linaro.org/s/JSsewXGZ6mqxPr5/' - 'download?path=3D%2F&files=3D' - 'xen-hypervisor-4.11-arm64_4.11.4%2B37-g3263f257ca-1_ar= m64.deb') - xen_sha1 =3D '034e634d4416adbad1212d59b62bccdcda63e62a' - xen_deb =3D self.fetch_asset(xen_url, asset_hash=3Dxen_sha1) - xen_path =3D self.extract_from_deb(xen_deb, "/boot/xen-4.11-arm64") - - self.launch_xen(xen_path) - - def test_arm64_xen_414_and_dom0(self): - # archive of file from https://deb.debian.org/debian/pool/main/x/x= en/ - xen_url =3D ('https://fileserver.linaro.org/s/JSsewXGZ6mqxPr5/' - 'download?path=3D%2F&files=3D' - 'xen-hypervisor-4.14-arm64_4.14.0%2B80-gd101b417b7-1_ar= m64.deb') - xen_sha1 =3D 'b9d209dd689ed2b393e625303a225badefec1160' - xen_deb =3D self.fetch_asset(xen_url, asset_hash=3Dxen_sha1) - xen_path =3D self.extract_from_deb(xen_deb, "/boot/xen-4.14-arm64") - - self.launch_xen(xen_path) - - def test_arm64_xen_415_and_dom0(self): - xen_url =3D ('https://fileserver.linaro.org/' - 's/JSsewXGZ6mqxPr5/download' - '?path=3D%2F&files=3Dxen-upstream-4.15-unstable.deb') - xen_sha1 =3D 'fc191172b85cf355abb95d275a24cc0f6d6579d8' - xen_deb =3D self.fetch_asset(xen_url, asset_hash=3Dxen_sha1) - xen_path =3D self.extract_from_deb(xen_deb, "/boot/xen-4.15-unstab= le") - - self.launch_xen(xen_path) diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 3f085bfbca..e595508bfa 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -77,6 +77,7 @@ tests_aarch64_system_thorough =3D [ 'aarch64_tcg_plugins', 'aarch64_tuxrun', 'aarch64_virt', + 'aarch64_xen', 'aarch64_xlnx_versal', 'multiprocess', ] diff --git a/tests/functional/test_aarch64_xen.py b/tests/functional/test_a= arch64_xen.py new file mode 100755 index 0000000000..339904221b --- /dev/null +++ b/tests/functional/test_aarch64_xen.py @@ -0,0 +1,90 @@ +#!/usr/bin/env python3 +# +# Functional test that boots a Xen hypervisor with a domU kernel and +# checks the console output is vaguely sane . +# +# Copyright (c) 2020 Linaro +# +# Author: +# Alex Benn=C3=A9e +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from qemu_test import Asset, LinuxKernelTest, wait_for_console_pattern + + +class BootXen(LinuxKernelTest): + """ + Boots a Xen hypervisor with a Linux DomU kernel. + """ + + timeout =3D 90 + XEN_COMMON_COMMAND_LINE =3D 'dom0_mem=3D128M loglvl=3Dall guest_loglvl= =3Dall' + + ASSET_KERNEL =3D Asset( + ('https://fileserver.linaro.org/s/JSsewXGZ6mqxPr5/' + 'download?path=3D%2F&files=3Dlinux-5.9.9-arm64-ajb'), + '00366fa51ea957c19462d2e2aefd480bef80ce727120e714ae48e0c88f261edb') + + def launch_xen(self, xen_path): + """ + Launch Xen with a dom0 guest kernel + """ + self.set_machine('virt') + self.cpu =3D "cortex-a57" + self.kernel_path =3D self.ASSET_KERNEL.fetch() + self.log.info("launch with xen_path: %s", xen_path) + + self.vm.set_console() + + self.vm.add_args('-machine', 'virtualization=3Don', + '-m', '768', + '-kernel', xen_path, + '-append', self.XEN_COMMON_COMMAND_LINE, + '-device', + 'guest-loader,addr=3D0x47000000,kernel=3D%s,boota= rgs=3Dconsole=3Dhvc0' + % (self.kernel_path)) + + self.vm.launch() + + console_pattern =3D 'VFS: Cannot open root device' + wait_for_console_pattern(self, console_pattern, "Panic on CPU 0:") + + ASSET_XEN_4_11 =3D Asset( + ('https://fileserver.linaro.org/s/JSsewXGZ6mqxPr5/download?path=3D= %2F&' + 'files=3Dxen-hypervisor-4.11-arm64_4.11.4%2B37-g3263f257ca-1_arm6= 4.deb'), + 'b745c2631342f9fcc0147ddc364edb62c20ecfebd430e5a3546e7d7c6891c0bc') + + def test_arm64_xen_411_and_dom0(self): + # archive of file from https://deb.debian.org/debian/pool/main/x/x= en/ + xen_path =3D self.archive_extract(self.ASSET_XEN_4_11, format=3D'd= eb', + member=3D"boot/xen-4.11-arm64") + self.launch_xen(xen_path) + + ASSET_XEN_4_14 =3D Asset( + ('https://fileserver.linaro.org/s/JSsewXGZ6mqxPr5/download?path=3D= %2F&' + 'files=3Dxen-hypervisor-4.14-arm64_4.14.0%2B80-gd101b417b7-1_arm6= 4.deb'), + 'e930a3293248edabd367d5b4b3b6448b9c99c057096ea8b47228a7870661d5cb') + + def test_arm64_xen_414_and_dom0(self): + # archive of file from https://deb.debian.org/debian/pool/main/x/x= en/ + xen_path =3D self.archive_extract(self.ASSET_XEN_4_14, format=3D'd= eb', + member=3D"boot/xen-4.14-arm64") + self.launch_xen(xen_path) + + ASSET_XEN_4_15 =3D Asset( + ('https://fileserver.linaro.org/s/JSsewXGZ6mqxPr5/download?path=3D= %2F&' + 'files=3Dxen-upstream-4.15-unstable.deb'), + '2a9a8af8acf0231844657cc28baab95bd918b0ee2d493ee4ee6f8846e1358bc9') + + def test_arm64_xen_415_and_dom0(self): + xen_path =3D self.archive_extract(self.ASSET_XEN_4_15, format=3D'd= eb', + member=3D"boot/xen-4.15-unstable") + self.launch_xen(xen_path) + + +if __name__ =3D=3D '__main__': + LinuxKernelTest.main() --=20 2.48.1 From nobody Fri Apr 4 21:12:24 2025 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=1739277138; cv=none; d=zohomail.com; s=zohoarc; b=MxalV/gZsWlqa9r+i181zX9LI8idAQq0lX8buEIURdG/qKgiR6Mph3hNeXwDbyM8oIHbngYJfAG5GxI6vZy0+5pR4INFy4YHgnlhLf9sLpumlrjiPqWN6Wkpy79UWBk/Vpe4r0kwQC3U5fOFSJECEWJL4zEwiEzZamND7YUFqxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739277138; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uc9/dlDT/bJAfXkGY2NKlVxGzjN+TLxFVh/CfDzVIY0=; b=B37jFBwboAqVmbfxWQjv7SvQ2IawsP36R1CI+GLRwgTTMuQ4ADklHA+AUK6ccGkInXAB6zfElenE1Wk2NKF5mxihEEKAUsO2s+0LZKbHgfiRlL1wZVXkSCpMQAf63Yzh5LAVNgMrFgsoff/L5eakT4D1tBTLODNXU9cpH+X22NE= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739277138751763.7789065755933; Tue, 11 Feb 2025 04:32:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thpQp-0005fz-Ic; Tue, 11 Feb 2025 07:32:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQo-0005ez-0o for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQm-0000Lm-Bv for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:01 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-422-Wx3N9Yc3PBewSlNbDiV2Vw-1; Tue, 11 Feb 2025 07:31:54 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 41FDF195609F; Tue, 11 Feb 2025 12:31:53 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.52]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 13EB819560A3; Tue, 11 Feb 2025 12:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739277119; 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=uc9/dlDT/bJAfXkGY2NKlVxGzjN+TLxFVh/CfDzVIY0=; b=MUkszilWzs7kgtxQXZcNrSjs3v2wdS+afecRRUUNJvn8DbBjjwGQW/D/y7J9OpaLJz3fem CDYi6zDvmx9RwMj8/CHSOxFyS6LlxijHnAX49hB5pSMgkv3xlu80I69WYpOLm+5k5csrOP FAM+bKjiXWarGA9hePCvKKq8dHTnwh8= X-MC-Unique: Wx3N9Yc3PBewSlNbDiV2Vw-1 X-Mimecast-MFC-AGG-ID: Wx3N9Yc3PBewSlNbDiV2Vw From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 2/7] tests/functional/test_aarch64_virt: Fix vulkan test without egl-headless Date: Tue, 11 Feb 2025 13:31:39 +0100 Message-ID: <20250211123144.37617-3-thuth@redhat.com> In-Reply-To: <20250211123144.37617-1-thuth@redhat.com> References: <20250211123144.37617-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739277141165019100 The vulkan test currently fails if the egl-headless device is not available. Let's add a proper check to skip the test in this case. Fixes: 3d30f882ce ("tests/functional: extend test_aarch64_virt with vulkan = test") Reported-by: Cornelia Huck Acked-by: Alex Benn=C3=A9e Tested-by: Cornelia Huck Message-ID: <20250205141140.97437-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/functional/test_aarch64_virt.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/functional/test_aarch64_virt.py b/tests/functional/test_= aarch64_virt.py index 07c1c13638..95f5ce8b4c 100755 --- a/tests/functional/test_aarch64_virt.py +++ b/tests/functional/test_aarch64_virt.py @@ -189,6 +189,8 @@ def test_aarch64_virt_with_gpu(self): self.skipTest("No venus support for virtio-gpu") elif "egl: no drm render node available" in excp.output: self.skipTest("Can't access host DRM render node") + elif "'type' does not accept value 'egl-headless'" in excp.out= put: + self.skipTest("egl-headless support is not available") else: self.log.info(f"unhandled launch failure: {excp.output}") raise excp --=20 2.48.1 From nobody Fri Apr 4 21:12:24 2025 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=1739277196; cv=none; d=zohomail.com; s=zohoarc; b=EF4TFvOAVBtgrHiyakX92FYEayS1xAX8zv0bPlC0JoYkKffW/Y5rEAXlIKxDMYnoxQYJ6etcHd/rdh9Bd21TnieC9CnFwIql0Jk3jkjXcNU3waCaLJ/wP8+XbboR8Ln6e1Fj7Rytm/6kiwg1zYi2035iZ9AuDQK5gFT8SPNxZ8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739277196; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yySPF2XVc59xk72H2CqL2RUBBUeR8dICsJbRFcZGRGs=; b=UYQW7OM6Pfy9q8b+i2awqzeHkR+NsfuxK8FyKIGWai/K7lZZWcN1PV+zIksUzbecffd9xifx0SvzQOr1Kkc1cUDJVkdtFv+vUDcMUnJarCMpt9UwLymjxoQ+zwx6JrX2HOkHX52R7QZuruAnsKQa6pp7syKUnJe/jsg5LbmDZek= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739277196531707.5803876208957; Tue, 11 Feb 2025 04:33:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thpQs-0005gp-64; Tue, 11 Feb 2025 07:32:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQo-0005f3-7S for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQl-0000Ih-Ve for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:01 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-55-5QLXKC9iO3CuLAt5gXS6fw-1; Tue, 11 Feb 2025 07:31:56 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 10B921800874 for ; Tue, 11 Feb 2025 12:31:56 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.52]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D9CDE19560A3; Tue, 11 Feb 2025 12:31:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739277118; 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=yySPF2XVc59xk72H2CqL2RUBBUeR8dICsJbRFcZGRGs=; b=eLpbzjsjdXEApOLho6p+BmLbodUgrkFinHJVS4ERat2hnDwfcpWTspn8Rc+oAO+78R04If iNN1ohApV0iM2A7vfO089T4LlQyN/u7lEvwOgI2GUSy3BVvcmVl7Q6AZg9C6LggQ+Djr+X PrBoSs7VDfhIA/anJrNQw9ijlhGR8Ac= X-MC-Unique: 5QLXKC9iO3CuLAt5gXS6fw-1 X-Mimecast-MFC-AGG-ID: 5QLXKC9iO3CuLAt5gXS6fw_1739277116 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 3/7] tests/functional: Convert the hotplug_blk avocado test Date: Tue, 11 Feb 2025 13:31:40 +0100 Message-ID: <20250211123144.37617-4-thuth@redhat.com> In-Reply-To: <20250211123144.37617-1-thuth@redhat.com> References: <20250211123144.37617-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739277198868019000 By using the serial console instead of ssh for executing commands in the guest, we can convert this test to the functional framework. Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: <20250130192712.19542-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 1 + tests/avocado/hotplug_blk.py | 69 ----------------- tests/functional/meson.build | 1 + tests/functional/test_x86_64_hotplug_blk.py | 85 +++++++++++++++++++++ 4 files changed, 87 insertions(+), 69 deletions(-) delete mode 100644 tests/avocado/hotplug_blk.py create mode 100755 tests/functional/test_x86_64_hotplug_blk.py diff --git a/MAINTAINERS b/MAINTAINERS index ebb415bc40..a593241800 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2275,6 +2275,7 @@ F: hw/block/virtio-blk.c F: hw/block/dataplane/* F: include/hw/virtio/virtio-blk-common.h F: tests/qtest/virtio-blk-test.c +F: tests/functional/test_x86_64_hotplug_blk.py T: git https://github.com/stefanha/qemu.git block =20 virtio-ccw diff --git a/tests/avocado/hotplug_blk.py b/tests/avocado/hotplug_blk.py deleted file mode 100644 index b36bca02ec..0000000000 --- a/tests/avocado/hotplug_blk.py +++ /dev/null @@ -1,69 +0,0 @@ -# Functional test that hotplugs a virtio blk disk and checks it on a Linux -# guest -# -# Copyright (c) 2021 Red Hat, Inc. -# Copyright (c) Yandex -# -# 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 time - -from avocado_qemu.linuxtest import LinuxTest - - -class HotPlug(LinuxTest): - def blockdev_add(self) -> None: - self.vm.cmd('blockdev-add', **{ - 'driver': 'null-co', - 'size': 1073741824, - 'node-name': 'disk' - }) - - def assert_vda(self) -> None: - self.ssh_command('test -e /sys/block/vda') - - def assert_no_vda(self) -> None: - with self.assertRaises(AssertionError): - self.assert_vda() - - def plug(self) -> None: - args =3D { - 'driver': 'virtio-blk-pci', - 'drive': 'disk', - 'id': 'virtio-disk0', - 'bus': 'pci.1', - 'addr': '1', - } - - self.assert_no_vda() - self.vm.cmd('device_add', args) - try: - self.assert_vda() - except AssertionError: - time.sleep(1) - self.assert_vda() - - def unplug(self) -> None: - self.vm.cmd('device_del', id=3D'virtio-disk0') - - self.vm.event_wait('DEVICE_DELETED', 1.0, - match=3D{'data': {'device': 'virtio-disk0'}}) - - self.assert_no_vda() - - def test(self) -> None: - """ - :avocado: tags=3Darch:x86_64 - :avocado: tags=3Dmachine:q35 - :avocado: tags=3Daccel:kvm - """ - self.require_accelerator('kvm') - self.vm.add_args('-accel', 'kvm') - self.vm.add_args('-device', 'pcie-pci-bridge,id=3Dpci.1,bus=3Dpcie= .0') - - self.launch_and_wait() - self.blockdev_add() - - self.plug() - self.unplug() diff --git a/tests/functional/meson.build b/tests/functional/meson.build index e595508bfa..70646d3457 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -285,6 +285,7 @@ tests_x86_64_system_thorough =3D [ 'multiprocess', 'netdev_ethtool', 'virtio_gpu', + 'x86_64_hotplug_blk', 'x86_64_hotplug_cpu', 'x86_64_kvm_xen', 'x86_64_tuxrun', diff --git a/tests/functional/test_x86_64_hotplug_blk.py b/tests/functional= /test_x86_64_hotplug_blk.py new file mode 100755 index 0000000000..7ddbfefc21 --- /dev/null +++ b/tests/functional/test_x86_64_hotplug_blk.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python3 +# +# Functional test that hotplugs a virtio blk disk and checks it on a Linux +# guest +# +# Copyright (c) 2021 Red Hat, Inc. +# Copyright (c) Yandex +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from qemu_test import LinuxKernelTest, Asset, exec_command_and_wait_for_pa= ttern + + +class HotPlugBlk(LinuxKernelTest): + + ASSET_KERNEL =3D Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux/rele= ases' + '/31/Server/x86_64/os/images/pxeboot/vmlinuz'), + 'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129') + + ASSET_INITRD =3D Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux/rele= ases' + '/31/Server/x86_64/os/images/pxeboot/initrd.img'), + '277cd6c7adf77c7e63d73bbb2cded8ef9e2d3a2f100000e92ff1f8396513cd8b') + + def blockdev_add(self) -> None: + self.vm.cmd('blockdev-add', **{ + 'driver': 'null-co', + 'size': 1073741824, + 'node-name': 'disk' + }) + + def assert_vda(self) -> None: + exec_command_and_wait_for_pattern(self, 'while ! test -e /sys/bloc= k/vda ;' + ' do sleep 0.2 ; done', '#= ') + + def assert_no_vda(self) -> None: + exec_command_and_wait_for_pattern(self, 'while test -e /sys/block/= vda ;' + ' do sleep 0.2 ; done', '#= ') + + def plug(self) -> None: + args =3D { + 'driver': 'virtio-blk-pci', + 'drive': 'disk', + 'id': 'virtio-disk0', + 'bus': 'pci.1', + 'addr': '1', + } + + self.assert_no_vda() + self.vm.cmd('device_add', args) + self.wait_for_console_pattern('virtio_blk virtio0: [vda]') + self.assert_vda() + + def unplug(self) -> None: + self.vm.cmd('device_del', id=3D'virtio-disk0') + + self.vm.event_wait('DEVICE_DELETED', 1.0, + match=3D{'data': {'device': 'virtio-disk0'}}) + + self.assert_no_vda() + + def test(self) -> None: + self.require_accelerator('kvm') + self.set_machine('q35') + + self.vm.add_args('-accel', 'kvm') + self.vm.add_args('-device', 'pcie-pci-bridge,id=3Dpci.1,bus=3Dpcie= .0') + self.vm.add_args('-m', '1G') + self.vm.add_args('-append', 'console=3DttyS0 rd.rescue') + + self.launch_kernel(self.ASSET_KERNEL.fetch(), + self.ASSET_INITRD.fetch(), + wait_for=3D'Entering emergency mode.') + self.wait_for_console_pattern('# ') + + self.blockdev_add() + + self.plug() + self.unplug() + + +if __name__ =3D=3D '__main__': + LinuxKernelTest.main() --=20 2.48.1 From nobody Fri Apr 4 21:12:24 2025 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=1739277187; cv=none; d=zohomail.com; s=zohoarc; b=l8emo8qyC7I8BSu+bs42JJ5gqp6CXlO9y3+lbGGCMVq2UDp9cHw2CRjtQm4ou6ZCK8L62+NGVPhObpGZeOJOLAsQiXYAh6hVWQNIxHDAuBMDdX+xALZhAN/KRXFT70MVt9eIEfKCy4jMNZtco0saYOer1Z85IGxHXUXTwcrjf6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739277187; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aCo5bAQdLEanaWjHroagXTkeDpLVAvRrOcjgUeyp7RA=; b=DRgNsDRHs/AnTSWB/azFBnG6O7ty6bTYaOo/uxzbLCJmfsl44S2Fo34HA6wSC6SAwYavMVfrIXI0S4XH4mZ+NGwbiSt1l+KQYNosmmPeXm/8ZshAmJFebQwqP3xgqk1HEK0PxbFniIsiIwHc1MmkET6Ulfq5p44W96Ooi7dmeL4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739277187260975.0673738014007; Tue, 11 Feb 2025 04:33:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thpQt-0005hJ-0w; Tue, 11 Feb 2025 07:32:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQr-0005gQ-B4 for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQp-0000Na-9o for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:04 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-542-lYqrODunM1iUVT4bnseyhg-1; Tue, 11 Feb 2025 07:32:00 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3FAD7180087C for ; Tue, 11 Feb 2025 12:31:58 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.52]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 71DE919560A3; Tue, 11 Feb 2025 12:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739277122; 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=aCo5bAQdLEanaWjHroagXTkeDpLVAvRrOcjgUeyp7RA=; b=hR55fLCzM4NVTumY3gnZ9xX4GjWOB3uVCy+sSiUE+ECIAb7yGcSFZfGxsaVKHfvOfKFyKk 6tLQbbaO9oUTE9GOmuxgMCSaB6DeRvOAr8cCaygBWz+6adSE32wfaAwkSk819+tNprmIZi B/yM2W7qOfmdcMHybIKMcsYZQfo1NIo= X-MC-Unique: lYqrODunM1iUVT4bnseyhg-1 X-Mimecast-MFC-AGG-ID: lYqrODunM1iUVT4bnseyhg From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 4/7] tests/functional: Add a ppc sam460ex test Date: Tue, 11 Feb 2025 13:31:41 +0100 Message-ID: <20250211123144.37617-5-thuth@redhat.com> In-Reply-To: <20250211123144.37617-1-thuth@redhat.com> References: <20250211123144.37617-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739277191320019100 From: C=C3=A9dric Le Goater The test sequence boots from kernel a sam460ex machine with a virtio-net device to check PCI. The buildroot is built with config : BR2_powerpc=3Dy BR2_powerpc_440fp=3Dy and the kernel with the '44x/canyonlands' deconfig and virtio support. Signed-off-by: C=C3=A9dric Le Goater Message-ID: <20250203092606.491933-1-clg@redhat.com> [thuth: sort meson.build alphabetically] Signed-off-by: Thomas Huth Acked-by: BALATON Zoltan --- MAINTAINERS | 1 + tests/functional/meson.build | 1 + tests/functional/test_ppc_sam460ex.py | 38 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 tests/functional/test_ppc_sam460ex.py diff --git a/MAINTAINERS b/MAINTAINERS index a593241800..794bde23a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1562,6 +1562,7 @@ F: pc-bios/canyonlands.dt[sb] F: pc-bios/u-boot-sam460ex-20100605.bin F: roms/u-boot-sam460ex F: docs/system/ppc/amigang.rst +F: tests/functional/test_ppc_sam460ex.py =20 pegasos2 M: BALATON Zoltan diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 70646d3457..b516d21cba 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -197,6 +197,7 @@ tests_ppc_system_thorough =3D [ 'ppc_bamboo', 'ppc_mac', 'ppc_mpc8544ds', + 'ppc_sam460ex', 'ppc_tuxrun', 'ppc_virtex_ml507', ] diff --git a/tests/functional/test_ppc_sam460ex.py b/tests/functional/test_= ppc_sam460ex.py new file mode 100644 index 0000000000..31cf9dd6de --- /dev/null +++ b/tests/functional/test_ppc_sam460ex.py @@ -0,0 +1,38 @@ +#!/usr/bin/env python3 +# +# Functional test that boots a sam460ex machine with a PPC 460EX CPU +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import LinuxKernelTest, Asset +from qemu_test import exec_command_and_wait_for_pattern + + +class sam460exTest(LinuxKernelTest): + + ASSET_BR2_SAM460EX_LINUX =3D Asset( + 'https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main/bui= ldroot/qemu_ppc_sam460ex-2023.11-8-gdcd9f0f6eb-20240105/vmlinux', + '6f46346f3e20e8b5fc050ff363f350f8b9d76a051b9e0bd7ea470cc680c14df2') + + def test_ppc_sam460ex_buildroot(self): + self.set_machine('sam460ex') + self.require_netdev('user') + + linux_path =3D self.ASSET_BR2_SAM460EX_LINUX.fetch() + + self.vm.set_console() + self.vm.add_args('-kernel', linux_path, + '-device', 'virtio-net-pci,netdev=3Dnet0', + '-netdev', 'user,id=3Dnet0') + self.vm.launch() + + self.wait_for_console_pattern('Linux version') + self.wait_for_console_pattern('Hardware name: amcc,canyonlands 460= EX') + self.wait_for_console_pattern('/init as init process') + self.wait_for_console_pattern('lease of 10.0.2.15 obtained') + self.wait_for_console_pattern('buildroot login:') + exec_command_and_wait_for_pattern(self, 'root', '#') + exec_command_and_wait_for_pattern(self, 'poweroff', 'System Halted= ') + +if __name__ =3D=3D '__main__': + LinuxKernelTest.main() --=20 2.48.1 From nobody Fri Apr 4 21:12:24 2025 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=1739277221; cv=none; d=zohomail.com; s=zohoarc; b=fpBIf6ZWkXF1Fj8QIceR0lxeMvJczEsCoeyj/AmE2KyctBd5EMFVb0KCqxiw37278WwkiBSiPT6V+j5oaP48TZFLCjpSbf1dcAWkK/RD6Fzo6/TLW/KS81FLfrWrQq6HCTOaqyKaqh5Q5q3iRbIf2jkwelevaQVB1xWbYDKNyQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739277221; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+ojImfigN5l1VNcIHNf6huQejoY5HsuARWAMCn/LL4w=; b=Kc1DMGV83L5bnYbUChz8zQ60JG0ZXbEBRGzW0iTbCHE1o2GBkFB8M0wN3eWuLNANULc9cgFfYdDJPserLfMsGHQiZEpSce5PewtGmBYGKSnKDeGeyBg4liW/wjimkDN0A5S6XmLhhKgSN7s2yCWVsZfbEjnFAkoIpSru/szxHQU= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739277221405748.2525279413989; Tue, 11 Feb 2025 04:33:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thpQu-0005hO-2c; Tue, 11 Feb 2025 07:32:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQs-0005h0-H9 for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQq-0000OK-Pn for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:06 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-345-4NSgsBvmMRC3hYsMsM8Lkg-1; Tue, 11 Feb 2025 07:32:01 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B56F11800876 for ; Tue, 11 Feb 2025 12:32:00 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.52]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EF1D219560A3; Tue, 11 Feb 2025 12:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739277123; 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=+ojImfigN5l1VNcIHNf6huQejoY5HsuARWAMCn/LL4w=; b=O7QeU/PuRhsScIc5GPiB2h14SZHHxkCvwfssBvye1ANDNK+Bf/XuiN6MsWI7GYFJ+CiCqi XF/KtOwwl4AqYaeAjNYH1oliy98mqWfLXj71gGv42vX/f5FjFrqp4Ez4SjTqxOZRM+AaiK uNFQAbUkQfVvGYhA/VMnrhTNp5zSs+k= X-MC-Unique: 4NSgsBvmMRC3hYsMsM8Lkg-1 X-Mimecast-MFC-AGG-ID: 4NSgsBvmMRC3hYsMsM8Lkg From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 5/7] gitlab: don't fail cirrus CI jobs when credits are exhausted Date: Tue, 11 Feb 2025 13:31:42 +0100 Message-ID: <20250211123144.37617-6-thuth@redhat.com> In-Reply-To: <20250211123144.37617-1-thuth@redhat.com> References: <20250211123144.37617-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739277223438019100 From: Daniel P. Berrang=C3=A9 In the last week of the month we have often run out of credits on Cirrus CI, which causes the jobs to fail, in turn causing the overall pipeline to fail. The cirrus-run tool can now detect the "out of credits" scenario and exits with a code of '3'. We can tell gitlab to treat this exit code as special and mark the job as "warning" instead of "failed". This allows the pipeline status overall to remain green, when we have non-technical issues with Cirrus CI. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20241204194807.1472261-2-berrange@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index a9e43e21d0..adc0007e5d 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -15,6 +15,8 @@ stage: build image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest needs: [] + allow_failure: + exit_codes: 3 # 20 mins larger than "timeout_in" in cirrus/build.yml # as there's often a 5-10 minute delay before Cirrus CI # actually starts the task --=20 2.48.1 From nobody Fri Apr 4 21:12:24 2025 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=1739277203; cv=none; d=zohomail.com; s=zohoarc; b=l1p0IVsxEHe5qLop7siIjiSPEEBvwT5G43BuORHbOBunl/90+EmDikOVD6VV+jlo2+XSegbIZYLFesam94mMI4uVtwROUX+XDJmcSSlWNjdKCD9p1SaSYOmypML1UcWscmSr/WlfB6MnYJR4GbeKJsRqTUPs1/SQQ29yDcUZsxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739277203; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VHs1ZaiKJaPcUtRFJVczS/sSFg2ptgtsIBXoQPKMhbk=; b=CL3QmMkOCNBtmoTQINN1jjO9/JJk30FBPvsiO4NK+qGW+4NpGju4yliCtJVpH4DKI858msPNGbX8ULyT7NDsEOqAoZlExNYAHFlebsTeKXL56Y1/syLhngwtJP6rXkEOv5kcK/Gk59xW7Cpo7qPIkRTk3B5CeFrQ5t6FD/12nQM= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739277203557401.10372432765564; Tue, 11 Feb 2025 04:33:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thpQv-0005i4-2u; Tue, 11 Feb 2025 07:32:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQt-0005hN-MP for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQr-0000OY-Os for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:07 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-394-8bkgpxzEMpufUPAI_ryZeA-1; Tue, 11 Feb 2025 07:32:03 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9EB8619560A6 for ; Tue, 11 Feb 2025 12:32:02 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.52]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4E81319560A3; Tue, 11 Feb 2025 12:32:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739277125; 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=VHs1ZaiKJaPcUtRFJVczS/sSFg2ptgtsIBXoQPKMhbk=; b=Srsqx2cM9c4g4JUDlXBZIW5feQ0tPis1EL5UNNS0/2VoH1c9eZDCv9oAqfJHqhzFWUP+VH eR/WCIWGBQ+2sCaflH9hp1S+kQHrrZrwpax/Hy33cGoe2GGzhe6zFuzXNh43m7SG0VaAEE SvEnUnJtcNMXdkXn+0mxt22wNJQtRq4= X-MC-Unique: 8bkgpxzEMpufUPAI_ryZeA-1 X-Mimecast-MFC-AGG-ID: 8bkgpxzEMpufUPAI_ryZeA From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 6/7] gitlab: use new(ish) cirrus-vars command for creating config Date: Tue, 11 Feb 2025 13:31:43 +0100 Message-ID: <20250211123144.37617-7-thuth@redhat.com> In-Reply-To: <20250211123144.37617-1-thuth@redhat.com> References: <20250211123144.37617-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739277205349019100 From: Daniel P. Berrang=C3=A9 Rather than a giant sed command with a hardcoded list of env var name, we can now use the new(ish) cirrus-vars command that libvirt has added to the 'cirrus-run' container. Signed-off-by: Daniel P. Berrang=C3=A9 Message-ID: <20241204194807.1472261-3-berrange@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/cirrus.yml | 23 +++-------------------- .gitlab-ci.d/cirrus/build.yml | 2 +- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index adc0007e5d..16411f3d2b 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -22,27 +22,10 @@ # actually starts the task timeout: 80m script: + - set -o allexport - source .gitlab-ci.d/cirrus/$NAME.vars - - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" - -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" - -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g" - -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" - -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" - -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" - -e "s|[@]CIRRUS_VM_CPUS@|$CIRRUS_VM_CPUS|g" - -e "s|[@]CIRRUS_VM_RAM@|$CIRRUS_VM_RAM|g" - -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" - -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" - -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g" - -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g" - -e "s|[@]PKGS@|$PKGS|g" - -e "s|[@]MAKE@|$MAKE|g" - -e "s|[@]PYTHON@|$PYTHON|g" - -e "s|[@]PIP3@|$PIP3|g" - -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" - -e "s|[@]CONFIGURE_ARGS@|$CONFIGURE_ARGS|g" - -e "s|[@]TEST_TARGETS@|$TEST_TARGETS|g" - <.gitlab-ci.d/cirrus/build.yml >.gitlab-ci.d/cirrus/$NAME.yml + - set +o allexport + - cirrus-vars <.gitlab-ci.d/cirrus/build.yml >.gitlab-ci.d/cirrus/$NAM= E.yml - cat .gitlab-ci.d/cirrus/$NAME.yml - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml variables: diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml index 102cdbd8b1..41abd0b31a 100644 --- a/.gitlab-ci.d/cirrus/build.yml +++ b/.gitlab-ci.d/cirrus/build.yml @@ -8,7 +8,7 @@ env: CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@" CI_COMMIT_REF_NAME: "@CI_COMMIT_REF_NAME@" CI_COMMIT_SHA: "@CI_COMMIT_SHA@" - PATH: "@PATH@" + PATH: "@PATH_EXTRA@:$PATH" PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@" PYTHON: "@PYTHON@" MAKE: "@MAKE@" --=20 2.48.1 From nobody Fri Apr 4 21:12:24 2025 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=1739277162; cv=none; d=zohomail.com; s=zohoarc; b=NmtHhng1SmgAoi/1Jfhn3oh9dB/aIJKakYt/8l54vgtv8UUEhvdZzmrM05LoTWIS3aK6CNV6/iNZFSUhJ9E8ucOQavb3SG0mo27gfAy705u61eJI/+pTq3egwI6TncCIsKgDF8BU+SQnp3Qo1GEODjqYTtx96O/dmSHqjcj78Pc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739277162; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xjq1osVPheqcNBnHYwcf0S/03M4wMF8/qgshDFrbFoo=; b=k3gZ8JIQeu80M+cE5HrrNsPdn6HZXUJwxydUVLDR2oknWtUHqfODTgMqiylBnA4P7qs3Ut8glcXbdIyijbrJYKJkyv0dvqKovd5aKn9VfPNcUma6zd3qenQ3yGvAESCLQswZDsjVXWNEsgBCePF9I+iiNCudYN9/BH4LTOa0UzQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 173927716231652.40357789226857; Tue, 11 Feb 2025 04:32:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thpQx-0005ip-Rg; Tue, 11 Feb 2025 07:32:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQv-0005iL-DV for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thpQt-0000Os-SO for qemu-devel@nongnu.org; Tue, 11 Feb 2025 07:32:09 -0500 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-590-pX-Ilf-3OIm-EniIFjapDw-1; Tue, 11 Feb 2025 07:32:05 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ED8A41956089 for ; Tue, 11 Feb 2025 12:32:04 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.52]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2296519560A3; Tue, 11 Feb 2025 12:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739277127; 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=xjq1osVPheqcNBnHYwcf0S/03M4wMF8/qgshDFrbFoo=; b=X8Eez0EKx/VgllTd9f2OytnFq5dfYhMta4L+tJcexuTZAoDF219jvUIouPnUUMqJR5JmUZ ht3R5hynyTEgRXrxinVRCYfnjfOc/Sn9F/fRIPzAo5QVBXscgyCKb5uZPC0dMs/PRBkRWp GYxOeW4esZ06ZY5auAdiRTmADUpcWHU= X-MC-Unique: pX-Ilf-3OIm-EniIFjapDw-1 X-Mimecast-MFC-AGG-ID: pX-Ilf-3OIm-EniIFjapDw From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 7/7] gitlab-ci.d/cirrus: Update the FreeBSD job to v14.2 Date: Tue, 11 Feb 2025 13:31:44 +0100 Message-ID: <20250211123144.37617-8-thuth@redhat.com> In-Reply-To: <20250211123144.37617-1-thuth@redhat.com> References: <20250211123144.37617-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739277165385019000 The FreeBSD job started to fail since the 14-1 image disappeared from the cloud. Update the job to v14.2 to fix it. Message-ID: <20250211120817.35050-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- .gitlab-ci.d/cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 16411f3d2b..75b611418e 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -37,7 +37,7 @@ x64-freebsd-14-build: NAME: freebsd-14 CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-14-1 + CIRRUS_VM_IMAGE_NAME: freebsd-14-2 CIRRUS_VM_CPUS: 8 CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update; pkg upgrade -y --=20 2.48.1