[PATCH 0/2] Extend trixie test coverage

[Anton Mikanovich]

Add fast build tests and run tests for some trixie targets.

Note: We don't run qemuarm-trixie run tests since the issue with
generating initrd images by dracut-install in this case causing
creation of unbootable system.

Anton Mikanovich (2):
CI: Add "full" run tests for trixie targets
CI: Add "fast" run tests for trixie target

meta-isar/conf/machine/qemuriscv64.conf | 2 +-
testsuite/citest.py | 42 +++++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)

--
2.34.1

[Anton Mikanovich]

Extend trixie coverage by "fast" cross-build and run test.

Signed-off-by: Anton Mikanovich <ami...@ilbers.de>
---
testsuite/citest.py | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)

diff --git a/testsuite/citest.py b/testsuite/citest.py
index 6dd4c7f3..b59bea0f 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -186,6 +186,18 @@ class CrossTest(CIBaseTest):
self.init()
self.perform_build_test(targets, debsrc_cache=True)

+ def test_cross_trixie(self):
+ targets = [
+ 'mc:qemuamd64-trixie:isar-image-base',
+ 'mc:qemuarm64-trixie:isar-image-base',
+ ]
+
+ self.init()
+ try:
+ self.perform_build_test(targets, cross=False)
+ except exceptions.TestFail:
+ self.cancel('KFAIL')
+
def test_cross_kselftest(self):
targets = [
'mc:qemuarm-buster:kselftest',
@@ -592,6 +604,14 @@ class VmBootTestFast(CIBaseTest):
script='test_systemd_unit.sh getty.target 10',
)

+ def test_amd64_trixie(self):
+ self.init()
+ self.vm_start('amd64', 'trixie')
+
+ def test_arm64_trixie(self):
+ self.init()
+ self.vm_start('arm64', 'trixie')
+

class VmBootTestFull(CIBaseTest):

--
2.34.1

[Anton Mikanovich]

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 <ami...@ilbers.de>
---

meta-isar/conf/machine/qemuriscv64.conf | 2 +-
testsuite/citest.py | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf
index b9656090..541e4abd 100644
--- a/meta-isar/conf/machine/qemuriscv64.conf
+++ b/meta-isar/conf/machine/qemuriscv64.conf
@@ -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"

diff --git a/testsuite/citest.py b/testsuite/citest.py
index 53881d25..6dd4c7f3 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -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',
--
2.34.1

[Anton Mikanovich]

Applied to next.