Add multiconfigs and cover them in full CI (with KFAIL because this
distro is in testing state).
Signed-off-by: Anton Mikanovich <
ami...@ilbers.de>
---
meta-isar/conf/mc.conf | 2 ++
meta-isar/conf/multiconfig/qemuamd64-forky.conf | 7 +++++++
meta-isar/conf/multiconfig/qemuarm64-forky.conf | 7 +++++++
testsuite/citest.py | 12 ++++++++++++
testsuite/data/targets.yml | 4 ++++
5 files changed, 32 insertions(+)
create mode 100644 meta-isar/conf/multiconfig/qemuamd64-forky.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm64-forky.conf
diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index cb69f5e3..2868ce46 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -16,6 +16,7 @@ BBMULTICONFIG = " \
qemuarm64-bullseye \
qemuarm64-bookworm \
qemuarm64-trixie \
+ qemuarm64-forky \
qemui386-buster \
qemui386-bullseye \
qemui386-bookworm \
@@ -26,6 +27,7 @@ BBMULTICONFIG = " \
qemuamd64-cip-bookworm \
qemuamd64-iso-bookworm \
qemuamd64-trixie \
+ qemuamd64-forky \
container-amd64-buster \
container-amd64-bullseye \
container-amd64-bookworm \
diff --git a/meta-isar/conf/multiconfig/qemuamd64-forky.conf b/meta-isar/conf/multiconfig/qemuamd64-forky.conf
new file mode 100644
index 00000000..5088433e
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-forky.conf
@@ -0,0 +1,7 @@
+# This software is a part of Isar.
+# Copyright (C) 2026 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "qemuamd64"
+DISTRO ?= "debian-forky"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-forky.conf b/meta-isar/conf/multiconfig/qemuarm64-forky.conf
new file mode 100644
index 00000000..46f73fa9
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm64-forky.conf
@@ -0,0 +1,7 @@
+# This software is a part of Isar.
+# Copyright (C) 2026 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "qemuarm64"
+DISTRO ?= "debian-forky"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 6a4c2fee..33d351e1 100644
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -1070,6 +1070,18 @@ class NoCrossTest(CIBaseTest):
self.init()
self.vm_start('riscv64', 'trixie')
+ def test_nocross_forky(self):
+ targets = [
+ 'mc:qemuamd64-forky:isar-image-base',
+ 'mc:qemuarm64-forky:isar-image-base',
+ ]
+
+ self.init()
+ try:
+ self.perform_build_test(targets, cross=False)
+ except exceptions.TestFail:
+ self.cancel('KFAIL')
+
def test_nocross_sid(self):
targets = [
'mc:qemuamd64-sid:isar-image-base',
diff --git a/testsuite/data/targets.yml b/testsuite/data/targets.yml
index a6769a0f..0c1c5f33 100644
--- a/testsuite/data/targets.yml
+++ b/testsuite/data/targets.yml
@@ -15,6 +15,8 @@ a: !mux
name: qemuarm64-bookworm
qemuarm64-trixie:
name: qemuarm64-trixie
+ qemuarm64-forky:
+ name: qemuarm64-forky
qemui386-buster:
name: qemui386-buster
qemui386-bullseye:
@@ -35,6 +37,8 @@ a: !mux
name: qemuamd64-iso-bookworm
qemuamd64-trixie:
name: qemuamd64-trixie
+ qemuamd64-forky:
+ name: qemuamd64-forky
container-amd64-buster:
name: container-amd64-buster
container-amd64-bullseye:
--
2.34.1