From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Sriram Yagnaraman" <sriram.yagnaraman@ericsson.com>,
"David Woodhouse" <dwmw2@infradead.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Leif Lindholm" <quic_llindhol@quicinc.com>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
kvm@vger.kernel.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Marcin Juszkiewicz" <marcin.juszkiewicz@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
qemu-arm@nongnu.org, "Radoslaw Biernacki" <rad@semihalf.com>,
"Cleber Rosa" <crosa@redhat.com>, "Paul Durrant" <paul@xen.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Akihiko Odaki" <akihiko.odaki@daynix.com>
Subject: [PATCH 07/13] tests/avocado/kvm_xen_guest.py: cope with asset RW requirements
Date: Fri, 26 Jul 2024 09:44:32 -0400 [thread overview]
Message-ID: <20240726134438.14720-8-crosa@redhat.com> (raw)
In-Reply-To: <20240726134438.14720-1-crosa@redhat.com>
Some of these tests actually require the root filesystem image,
obtained through Avocado's asset feature and kept in a common cache
location, to be writable.
This makes a distinction between the tests that actually have this
requirement and those who don't. The goal is to be as safe as
possible, avoiding causing cache misses (because the assets get
modified and thus need to be dowloaded again) while avoid copying the
root filesystem backing file whenever possible.
This also allow these tests to be run in parallel with newer Avocado
versions.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
tests/avocado/kvm_xen_guest.py | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/tests/avocado/kvm_xen_guest.py b/tests/avocado/kvm_xen_guest.py
index 318fadebc3..d73fa888ef 100644
--- a/tests/avocado/kvm_xen_guest.py
+++ b/tests/avocado/kvm_xen_guest.py
@@ -10,6 +10,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
import os
+import shutil
from qemu.machine import machine
@@ -43,7 +44,7 @@ def get_asset(self, name, sha1):
return self.fetch_asset(name=f"qemu-kvm-xen-guest-{name}",
locations=(url), asset_hash=sha1)
- def common_vm_setup(self):
+ def common_vm_setup(self, readwrite=False):
# We also catch lack of KVM_XEN support if we fail to launch
self.require_accelerator("kvm")
@@ -56,11 +57,19 @@ def common_vm_setup(self):
"367962983d0d32109998a70b45dcee4672d0b045")
self.rootfs = self.get_asset("rootfs.ext4",
"f1478401ea4b3fa2ea196396be44315bab2bb5e4")
+ if readwrite:
+ dest = os.path.join(self.workdir, os.path.basename(self.rootfs))
+ shutil.copy(self.rootfs, dest)
+ self.rootfs = dest
- def run_and_check(self):
+ def run_and_check(self, readwrite=False):
+ if readwrite:
+ drive = f"file={self.rootfs},if=none,format=raw,id=drv0"
+ else:
+ drive = f"file={self.rootfs},if=none,readonly=on,format=raw,id=drv0"
self.vm.add_args('-kernel', self.kernel_path,
'-append', self.kernel_params,
- '-drive', f"file={self.rootfs},if=none,snapshot=on,format=raw,id=drv0",
+ '-drive', drive,
'-device', 'xen-disk,drive=drv0,vdev=xvda',
'-device', 'virtio-net-pci,netdev=unet',
'-netdev', 'user,id=unet,hostfwd=:127.0.0.1:0-:22')
@@ -90,11 +99,11 @@ def test_kvm_xen_guest(self):
:avocado: tags=kvm_xen_guest
"""
- self.common_vm_setup()
+ self.common_vm_setup(True)
self.kernel_params = (self.KERNEL_DEFAULT +
' xen_emul_unplug=ide-disks')
- self.run_and_check()
+ self.run_and_check(True)
self.ssh_command('grep xen-pirq.*msi /proc/interrupts')
def test_kvm_xen_guest_nomsi(self):
@@ -102,11 +111,11 @@ def test_kvm_xen_guest_nomsi(self):
:avocado: tags=kvm_xen_guest_nomsi
"""
- self.common_vm_setup()
+ self.common_vm_setup(True)
self.kernel_params = (self.KERNEL_DEFAULT +
' xen_emul_unplug=ide-disks pci=nomsi')
- self.run_and_check()
+ self.run_and_check(True)
self.ssh_command('grep xen-pirq.* /proc/interrupts')
def test_kvm_xen_guest_noapic_nomsi(self):
@@ -114,11 +123,11 @@ def test_kvm_xen_guest_noapic_nomsi(self):
:avocado: tags=kvm_xen_guest_noapic_nomsi
"""
- self.common_vm_setup()
+ self.common_vm_setup(True)
self.kernel_params = (self.KERNEL_DEFAULT +
' xen_emul_unplug=ide-disks noapic pci=nomsi')
- self.run_and_check()
+ self.run_and_check(True)
self.ssh_command('grep xen-pirq /proc/interrupts')
def test_kvm_xen_guest_vapic(self):
--
2.45.2
next prev parent reply other threads:[~2024-07-26 13:48 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-26 13:44 [PATCH 00/13] Bump Avocado to 103.0 LTS and update tests for compatibility and new features Cleber Rosa
2024-07-26 13:44 ` [PATCH 01/13] tests/avocado: mips: fallback to HTTP given certificate expiration Cleber Rosa
2024-07-29 11:49 ` Philippe Mathieu-Daudé
2024-07-26 13:44 ` [PATCH 02/13] tests/avocado: mips: add hint for fetchasset plugin Cleber Rosa
2024-07-29 13:31 ` Philippe Mathieu-Daudé
2024-07-26 13:44 ` [PATCH 03/13] tests/avocado/intel_iommu.py: increase timeout Cleber Rosa
2024-07-29 10:30 ` Daniel P. Berrangé
2024-08-01 1:02 ` Cleber Rosa
2024-08-12 7:33 ` Eric Auger
2024-07-26 13:44 ` [PATCH 04/13] tests/avocado: add cdrom permission related tests Cleber Rosa
2024-07-26 13:44 ` [PATCH 05/13] tests/avocado: machine aarch64: standardize location and RO access Cleber Rosa
2024-07-29 10:34 ` Daniel P. Berrangé
2024-07-29 11:54 ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 06/13] tests/avocado: use more distinct names for assets Cleber Rosa
2024-07-29 10:49 ` Daniel P. Berrangé
2024-07-29 11:54 ` Philippe Mathieu-Daudé
2024-08-01 3:20 ` Cleber Rosa
2024-08-01 3:12 ` Cleber Rosa
2024-08-01 16:05 ` Alex Bennée
2024-07-26 13:44 ` Cleber Rosa [this message]
2024-07-29 10:58 ` [PATCH 07/13] tests/avocado/kvm_xen_guest.py: cope with asset RW requirements Daniel P. Berrangé
2024-07-29 12:03 ` David Woodhouse
2024-08-01 14:26 ` Alex Bennée
2024-08-01 15:39 ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 08/13] testa/avocado: test_arm_emcraft_sf2: handle RW requirements for asset Cleber Rosa
2024-07-29 10:59 ` Daniel P. Berrangé
2024-07-26 13:44 ` [PATCH 09/13] tests/avocado/boot_xen.py: fetch kernel during test setUp() Cleber Rosa
2024-07-29 11:01 ` Daniel P. Berrangé
2024-08-01 3:24 ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 10/13] tests/avocado/tuxrun_baselines.py: use Avocado's zstd support Cleber Rosa
2024-07-29 11:02 ` Daniel P. Berrangé
2024-07-29 14:39 ` Philippe Mathieu-Daudé
2024-08-01 3:39 ` Cleber Rosa
2024-08-01 12:59 ` Philippe Mathieu-Daudé
2024-08-01 15:18 ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 11/13] tests/avocado/machine_aarch64_sbsaref.py: allow for rw usage of image Cleber Rosa
2024-07-29 11:05 ` Daniel P. Berrangé
2024-07-26 13:44 ` [PATCH 12/13] Bump avocado to 103.0 Cleber Rosa
2024-07-29 11:08 ` Daniel P. Berrangé
2024-07-29 12:02 ` Philippe Mathieu-Daudé
2024-08-01 0:48 ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 13/13] Avocado tests: allow for parallel execution of tests Cleber Rosa
2024-07-28 15:27 ` [PATCH 00/13] Bump Avocado to 103.0 LTS and update tests for compatibility and new features Akihiko Odaki
2024-07-29 14:40 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240726134438.14720-8-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=akihiko.odaki@daynix.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=dwmw2@infradead.org \
--cc=jiaxun.yang@flygoat.com \
--cc=kvm@vger.kernel.org \
--cc=marcin.juszkiewicz@linaro.org \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quic_llindhol@quicinc.com \
--cc=rad@semihalf.com \
--cc=sriram.yagnaraman@ericsson.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).