Re: [PATCH 11/11] tests/avocado: don't use tags to define drive

[David Woodhouse]

On Fri, 2023-03-10 at 10:31 +0000, Alex Bennée wrote:
> We are abusing the avocado tags which are intended to provide test
> selection metadata to provide parameters to our test. This works OK
> up
> until the point you need to have ,'s in the field as this is the tag
> separator character which is the case for a number of the drive
> parameters. Fix this by making drive a parameter to the common helper
> function.
> 
> Fixes: 267fe57c23 (tests: add tuxrun baseline test to avocado)
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: David Woodhouse <dwmw2@infradead.org>


Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>

Thanks! Now this works (and I should update the commit message)...


From 8b9e04d1c7c942f51b575b94fd280bd2353f76b6 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw@amazon.co.uk>
Date: Thu, 9 Mar 2023 17:34:44 +0000
Subject: [PATCH] Boot KVM/Xen guest with tuxrun

The drive tag doesn't work right, and drops extra args. And we're
using a temporary kernel build.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
 tests/avocado/tuxrun_baselines.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/avocado/tuxrun_baselines.py 
b/tests/avocado/tuxrun_baselines.py
index c3fb67f5dc..0abb77023d 100644
--- a/tests/avocado/tuxrun_baselines.py
+++ b/tests/avocado/tuxrun_baselines.py
@@ -83,7 +83,8 @@ def fetch_tuxrun_assets(self, dt=None):
         use the per-test tags to fetch details.
         """
         base_url = f"https://storage.tuxboot.com/{self.tuxboot}/";
-        kernel_image =  self.fetch_asset(base_url + self.image)
+        #kernel_image =  self.fetch_asset(base_url + self.image)
+        kernel_image = 
self.fetch_asset('https://storage.tuxsuite.com/public/linaro/alex/builds/2MmnfXeo73oWy3oaJx1bxliw8z4/bzImage')
         disk_image_zst = self.fetch_asset(base_url + "rootfs.ext4.zst")
 
         cmd = f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs.ext4"
@@ -409,3 +410,17 @@ def test_x86_64(self):
         :avocado: tags=shutdown:nowait
         """
         self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
+
+    def test_x86_64_kvm_xen(self):
+        """
+        :avocado: tags=arch:x86_64
+        :avocado: tags=machine:q35
+        :avocado: tags=cpu:Nehalem
+        :avocado: tags=tuxboot:x86_64
+        :avocado: tags=image:bzImage
+        :avocado: tags=root:xvda
+        :avocado: tags=shutdown:nowait
+        """
+        self.require_accelerator("kvm")
+        self.vm.add_args("-accel", 
"kvm,xen-version=0x4000a,kernel-irqchip=split")
+        self.common_tuxrun(drive="driver=xen-disk,vdev=xvda")
-- 
2.34.1

smime.p7s
Description: S/MIME cryptographic signature