@@ -18,7 +18,7 @@ QEMU_ROOTFS_DEV ?= "vda"
QEMU_ARCH ?= "riscv64"
QEMU_MACHINE ?= "virt"
-QEMU_CPU ?= "rv64gcsu-v1.10.0"
+QEMU_CPU ?= "rv64"
# TODO: start_vm doesn't support multiline vars
QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
@@ -628,6 +628,13 @@ class VmBootTestFull(CIBaseTest):
script='test_systemd_unit.sh getty.target 10',
)
+ def test_arm_trixie(self):
+ self.init()
+ try:
+ self.vm_start('arm', 'trixie')
+ except exceptions.TestFail:
+ self.cancel('KFAIL')
+
def test_arm64_bookworm(self):
self.init()
self.vm_start('arm64', 'bookworm', image='isar-image-ci', keep=True)
@@ -652,6 +659,10 @@ class VmBootTestFull(CIBaseTest):
keep=True,
)
+ def test_arm64_trixie(self):
+ self.init()
+ self.vm_start('arm64', 'trixie')
+
def test_i386_buster(self):
self.init()
self.vm_start('i386', 'buster')
@@ -702,6 +713,10 @@ class VmBootTestFull(CIBaseTest):
self.init()
self.vm_start('mipsel', 'bookworm', image='isar-image-ci', keep=True)
+ def test_amd64_trixie(self):
+ self.init()
+ self.vm_start('amd64', 'trixie')
+
def test_mipsel_bookworm_getty_target(self):
self.init()
self.vm_start(
@@ -721,6 +736,13 @@ class VmBootTestFull(CIBaseTest):
script='test_kernel_module.sh example_module',
)
+ def test_riscv64_trixie(self):
+ self.init()
+ try:
+ self.vm_start('riscv64', 'trixie')
+ except exceptions.TestFail:
+ self.cancel('KFAIL')
+
def test_amd64_bookworm_prebuilt_containers(self):
self.init()
self.vm_start('amd64', 'bookworm', image='isar-image-ci',
Due to upcoming trixie release, extend testsuite with appropriate run tests. Also, since we have first qemuriscv64 run test now, fix incorrect (unsupported by recent qemu versions) machine configuration. Allow test_riscv64_trixie run test to cancel/KFAIL similar to appropriate build tests. Allow test_arm_trixie run test to cancel/KFAIL since the machine fails to boot due to known bug with initrd generation on trixie/armhf. Signed-off-by: Anton Mikanovich <amikan@ilbers.de> --- meta-isar/conf/machine/qemuriscv64.conf | 2 +- testsuite/citest.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-)