[PATCH 2/8] Migrate repro test from bullseye to bookworm

[Anton Mikanovich]

From: Maria Selvam <mar...@ilbers.de>

Add new bookworm targets to repro test and remove the duplicated
targets from tests.

Signed-off-by: Maria Selvam <mar...@ilbers.de>
---
testsuite/citest.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/testsuite/citest.py b/testsuite/citest.py
index 5c0f92e4..d0c33b1e 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -84,9 +84,9 @@ class ReproTest(CIBaseTest):

def test_repro_signed(self):
targets = [
- 'mc:rpi-arm-v7-bullseye:isar-image-base',
- 'mc:rpi-arm64-v8-bullseye:isar-image-base',
- 'mc:qemuarm64-bullseye:isar-image-base',
+ 'mc:rpi-arm-v7-bookworm:isar-image-base',
+ 'mc:rpi-arm64-v8-bookworm:isar-image-base',
+ 'mc:qemuarm64-bookworm:isar-image-base',
]

self.init()
@@ -97,8 +97,8 @@ class ReproTest(CIBaseTest):

def test_repro_unsigned(self):
targets = [
- 'mc:qemuamd64-bullseye:isar-image-base',
- 'mc:qemuarm-bullseye:isar-image-base',
+ 'mc:qemuamd64-bookworm:isar-image-base',
+ 'mc:qemuarm-bookworm:isar-image-base',
]

self.init()
@@ -248,6 +248,7 @@ class NoCrossTest(CIBaseTest):
targets = [
'mc:qemuarm-buster:isar-image-ci',
'mc:qemuarm-bullseye:isar-image-base',
+ 'mc:qemuarm64-bullseye:isar-image-base',
'mc:qemuarm64-bookworm:isar-image-ci',
'mc:qemui386-buster:isar-image-base',
'mc:qemui386-bullseye:isar-image-base',
@@ -291,7 +292,6 @@ class NoCrossTest(CIBaseTest):
'mc:rpi-arm-v7-bullseye:isar-image-base',
'mc:rpi-arm-v7l-bullseye:isar-image-base',
'mc:rpi-arm64-v8-bullseye:isar-image-base',
- 'mc:rpi-arm64-v8-bookworm:isar-image-base',
]

self.init()
@@ -300,7 +300,6 @@ class NoCrossTest(CIBaseTest):
def test_nocross_rpi_debsrc(self):
targets = [
'mc:rpi-arm-bookworm:isar-image-base',
- 'mc:rpi-arm-v7-bookworm:isar-image-base',
'mc:rpi-arm-v7l-bookworm:isar-image-base',
]

--
2.34.1

[Anton Mikanovich]

From: Maria Selvam <mar...@ilbers.de>

Add new bookworm targets to dev test and remove the duplicate
bullseye targets.

Signed-off-by: Maria Selvam <mar...@ilbers.de>
---

testsuite/citest.py | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/testsuite/citest.py b/testsuite/citest.py
index a5661eac..5c0f92e4 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -28,10 +28,10 @@ class DevTest(CIBaseTest):

def test_dev(self):
targets = [
- 'mc:qemuamd64-bullseye:isar-image-ci',

- 'mc:qemuarm-bullseye:isar-image-base',

- 'mc:qemuarm-bullseye:isar-image-base:do_populate_sdk',

- 'mc:qemuarm64-bullseye:isar-image-base',

+ 'mc:qemuamd64-bookworm:isar-image-ci',

+ 'mc:qemuarm-bookworm:isar-image-base',

+ 'mc:qemuarm-bookworm:isar-image-base:do_populate_sdk',

+ 'mc:qemuarm64-bookworm:isar-image-base',
]

self.init()

@@ -39,8 +39,8 @@ class DevTest(CIBaseTest):

def test_dev_apps(self):
targets = [
- 'mc:qemuamd64-bullseye:isar-image-ci',

- 'mc:qemuarm64-bullseye:isar-image-base',

+ 'mc:qemuamd64-bookworm:isar-image-ci',

+ 'mc:qemuarm64-bookworm:isar-image-base',
]

self.init()

@@ -57,21 +57,21 @@ class DevTest(CIBaseTest):
file.write('do_fetch:append() {\n\n}')

try:
- self.perform_build_test('mc:qemuamd64-bullseye:isar-image-ci')
+ self.perform_build_test('mc:qemuamd64-bookworm:isar-image-ci')
finally:
self.restorefile(dpkgbase_file)

- def test_dev_run_amd64_bullseye(self):
+ def test_dev_run_amd64_bookworm(self):
self.init()
- self.vm_start('amd64', 'bullseye', image='isar-image-ci')
+ self.vm_start('amd64', 'bookworm', image='isar-image-ci')

- def test_dev_run_arm64_bullseye(self):
+ def test_dev_run_arm64_bookworm(self):
self.init()
- self.vm_start('arm64', 'bullseye')
+ self.vm_start('arm64', 'bookworm')

- def test_dev_run_arm_bullseye(self):
+ def test_dev_run_arm_bookworm(self):
self.init()
- self.vm_start('arm', 'bullseye', skip_modulecheck=True)
+ self.vm_start('arm', 'bookworm', skip_modulecheck=True)


class ReproTest(CIBaseTest):
@@ -410,7 +410,6 @@ class SignatureTest(CIBaseTest):
'mc:qemuamd64-bullseye:isar-image-ci',
'mc:qemuarm-bullseye:isar-image-base',
'mc:qemuarm-bullseye:isar-image-base:do_populate_sdk',
- 'mc:qemuarm64-bookworm:isar-image-base',
'mc:qemuamd64-focal:isar-image-base',
]

--
2.34.1

[Anton Mikanovich]

To keep testsuite up to date, this patchset has all the CI test suite
related changes which includes migration of dev and repro CI tests to
bookworm. Also it contains CI coverage related changes for Ubuntu Noble,
Jammy and x86 targets.

Maria Selvam (8):
Migrate bullseye dev test to bookworm
Migrate repro test from bullseye to bookworm
Migrate riscv64 targets to Trixie
Cover Ubuntu Noble distro with CI
Cover Ubuntu Jammy with CI
Cover x86 PC target with CI
Create QEMU targets for Sid
CI: Resolve sourceTest failure

meta-isar/conf/mc.conf | 12 ++--
meta-isar/conf/multiconfig/qemuamd64-sid.conf | 7 +++
meta-isar/conf/multiconfig/qemuarm64-sid.conf | 7 +++
...scv64-sid.conf => qemuriscv64-trixie.conf} | 4 +-
.../conf/multiconfig/sifive-fu540-sid.conf | 7 ---
.../conf/multiconfig/sifive-fu540-trixie.conf | 7 +++
.../multiconfig/starfive-visionfive2-sid.conf | 7 ---
.../starfive-visionfive2-trixie.conf | 7 +++
testsuite/cibase.py | 14 ++++-
testsuite/citest.py | 55 ++++++++++---------
10 files changed, 81 insertions(+), 46 deletions(-)
create mode 100644 meta-isar/conf/multiconfig/qemuamd64-sid.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm64-sid.conf
rename meta-isar/conf/multiconfig/{qemuriscv64-sid.conf => qemuriscv64-trixie.conf} (67%)
delete mode 100644 meta-isar/conf/multiconfig/sifive-fu540-sid.conf
create mode 100644 meta-isar/conf/multiconfig/sifive-fu540-trixie.conf
delete mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf
create mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf

--
2.34.1

[Anton Mikanovich]

From: Maria Selvam <mar...@ilbers.de>

Migrate multiconfig targets from Sid to Trixie and cover them with CI.

Signed-off-by: Maria Selvam <mar...@ilbers.de>
---

meta-isar/conf/mc.conf | 6 +++---
...uriscv64-sid.conf => qemuriscv64-trixie.conf} | 4 ++--
meta-isar/conf/multiconfig/sifive-fu540-sid.conf | 7 -------
.../conf/multiconfig/sifive-fu540-trixie.conf | 7 +++++++
.../multiconfig/starfive-visionfive2-sid.conf | 7 -------
.../multiconfig/starfive-visionfive2-trixie.conf | 7 +++++++
testsuite/citest.py | 16 +++-------------
7 files changed, 22 insertions(+), 32 deletions(-)

rename meta-isar/conf/multiconfig/{qemuriscv64-sid.conf => qemuriscv64-trixie.conf} (67%)
delete mode 100644 meta-isar/conf/multiconfig/sifive-fu540-sid.conf
create mode 100644 meta-isar/conf/multiconfig/sifive-fu540-trixie.conf
delete mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf
create mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf

diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index 7c190b67..fb829b30 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -29,7 +29,7 @@ BBMULTICONFIG = " \
container-amd64-bookworm \
qemumipsel-bullseye \
qemumipsel-bookworm \
- qemuriscv64-sid \
+ qemuriscv64-trixie \
bananapi-buster \
bananapi-bullseye \
bananapi-bookworm \
@@ -59,8 +59,8 @@ BBMULTICONFIG = " \
rpi-arm-v7l-bookworm \
rpi-arm64-v8-bullseye \
rpi-arm64-v8-bookworm \
- sifive-fu540-sid \
- starfive-visionfive2-sid \
+ sifive-fu540-trixie \
+ starfive-visionfive2-trixie \
qemuarm64-focal \
qemuarm64-jammy \
qemuarm64-noble \
diff --git a/meta-isar/conf/multiconfig/qemuriscv64-sid.conf b/meta-isar/conf/multiconfig/qemuriscv64-trixie.conf
similarity index 67%
rename from meta-isar/conf/multiconfig/qemuriscv64-sid.conf
rename to meta-isar/conf/multiconfig/qemuriscv64-trixie.conf
index bc691b5b..73039274 100644
--- a/meta-isar/conf/multiconfig/qemuriscv64-sid.conf
+++ b/meta-isar/conf/multiconfig/qemuriscv64-trixie.conf
@@ -1,8 +1,8 @@
# This software is a part of ISAR.
-# Copyright (C) 2017 ilbers GmbH
+# Copyright (C) 2017-2025 ilbers GmbH
# Copyright (c) Siemens AG, 2019-2020
#
# SPDX-License-Identifier: MIT

MACHINE ?= "qemuriscv64"
-DISTRO ?= "debian-sid"
+DISTRO ?= "debian-trixie"
diff --git a/meta-isar/conf/multiconfig/sifive-fu540-sid.conf b/meta-isar/conf/multiconfig/sifive-fu540-sid.conf
deleted file mode 100644
index 99bb7f3e..00000000
--- a/meta-isar/conf/multiconfig/sifive-fu540-sid.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Siemens AG, 2020
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE ?= "sifive-fu540"
-DISTRO ?= "debian-sid"
diff --git a/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf b/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf
new file mode 100644
index 00000000..841d2e5c
--- /dev/null
+++ b/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf
@@ -0,0 +1,7 @@
+# This software is a part of Isar.
+# Copyright (C) 2025 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "sifive-fu540"
+DISTRO ?= "debian-trixie"
diff --git a/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf
deleted file mode 100644
index 603e891f..00000000
--- a/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Siemens AG, 2023
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE ?= "starfive-visionfive2"
-DISTRO ?= "debian-sid"
diff --git a/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf
new file mode 100644
index 00000000..f2ccb2b8
--- /dev/null
+++ b/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf
@@ -0,0 +1,7 @@
+# This software is a part of Isar.
+# Copyright (C) 2025 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "starfive-visionfive2"
+DISTRO ?= "debian-trixie"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index d0c33b1e..68881bca 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -311,19 +311,9 @@ class NoCrossTest(CIBaseTest):
'mc:qemuamd64-trixie:isar-image-base',
'mc:qemuarm64-trixie:isar-image-base',
'mc:qemuarm-trixie: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:qemuriscv64-sid:isar-image-base',
- 'mc:sifive-fu540-sid:isar-image-base',
- 'mc:starfive-visionfive2-sid:isar-image-base',
+ 'mc:qemuriscv64-trixie:isar-image-base',
+ 'mc:sifive-fu540-trixie:isar-image-base',
+ 'mc:starfive-visionfive2-trixie:isar-image-base',
]

self.init()
--
2.34.1

[Anton Mikanovich]

From: Maria Selvam <mar...@ilbers.de>

Add Ubuntu Jammy targets to CI test for coverage.

Signed-off-by: Maria Selvam <mar...@ilbers.de>
---

testsuite/citest.py | 2 ++
1 file changed, 2 insertions(+)

diff --git a/testsuite/citest.py b/testsuite/citest.py
index f9f87767..9e50bd18 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -273,6 +273,8 @@ class NoCrossTest(CIBaseTest):
'mc:beagleplay-bookworm:isar-image-base',
'mc:qemuarm64-noble:isar-image-base',
'mc:qemuamd64-noble:isar-image-base',
+ 'mc:qemuamd64-jammy:isar-image-base',
+ 'mc:qemuarm64-jammy:isar-image-base',
]

self.init()
--
2.34.1

[Anton Mikanovich]

From: Maria Selvam <mar...@ilbers.de>

Add x86 PC target to the test suite for CI test coverage.

Signed-off-by: Maria Selvam <mar...@ilbers.de>
---

testsuite/citest.py | 1 +
1 file changed, 1 insertion(+)

diff --git a/testsuite/citest.py b/testsuite/citest.py
index 9e50bd18..ce3d1129 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -275,6 +275,7 @@ class NoCrossTest(CIBaseTest):
'mc:qemuamd64-noble:isar-image-base',
'mc:qemuamd64-jammy:isar-image-base',
'mc:qemuarm64-jammy:isar-image-base',
+ 'mc:x86-pc-bookworm:isar-image-base',
]

self.init()
--
2.34.1

[Anton Mikanovich]

From: Maria Selvam <mar...@ilbers.de>

Add ubuntu noble distro on CI test suite for coverage.

Signed-off-by: Maria Selvam <mar...@ilbers.de>
---

testsuite/citest.py | 2 ++
1 file changed, 2 insertions(+)

diff --git a/testsuite/citest.py b/testsuite/citest.py
index 68881bca..f9f87767 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -271,6 +271,8 @@ class NoCrossTest(CIBaseTest):
'mc:qemumipsel-bookworm:isar-image-ci',
'mc:hikey-bookworm:isar-image-base',
'mc:beagleplay-bookworm:isar-image-base',
+ 'mc:qemuarm64-noble:isar-image-base',
+ 'mc:qemuamd64-noble:isar-image-base',
]

self.init()
--
2.34.1

[Anton Mikanovich]

From: Maria Selvam <mar...@ilbers.de>

Add new multiconfig targets for QEMU Sid (amd64 & arm64)
and cover them with CI testsuite.

Signed-off-by: Maria Selvam <mar...@ilbers.de>
---

meta-isar/conf/mc.conf | 6 +++++-
meta-isar/conf/multiconfig/qemuamd64-sid.conf | 7 +++++++
meta-isar/conf/multiconfig/qemuarm64-sid.conf | 7 +++++++
testsuite/citest.py | 12 ++++++++++++
4 files changed, 31 insertions(+), 1 deletion(-)

create mode 100644 meta-isar/conf/multiconfig/qemuamd64-sid.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm64-sid.conf

diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index fb829b30..55969c7b 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -1,5 +1,7 @@
# This software is a part of Isar.
-# Copyright (C) 2023-2024 ilbers GmbH
+# Copyright (C) 2023-2025 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT

# If you want to use multiple configuration files for the build, list them in the
# following option.
@@ -67,4 +69,6 @@ BBMULTICONFIG = " \
qemuamd64-focal \
qemuamd64-jammy \
qemuamd64-noble \
+ qemuamd64-sid \
+ qemuarm64-sid \
"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-sid.conf b/meta-isar/conf/multiconfig/qemuamd64-sid.conf
new file mode 100644
index 00000000..5451576e
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-sid.conf

@@ -0,0 +1,7 @@
+# This software is a part of Isar.
+# Copyright (C) 2025 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+

+MACHINE ?= "qemuamd64"
+DISTRO ?= "debian-sid"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-sid.conf b/meta-isar/conf/multiconfig/qemuarm64-sid.conf
new file mode 100644
index 00000000..ad545710
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm64-sid.conf

@@ -0,0 +1,7 @@
+# This software is a part of Isar.
+# Copyright (C) 2025 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+

+MACHINE ?= "qemuarm64"
+DISTRO ?= "debian-sid"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index ce3d1129..e2ce45d1 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -327,6 +327,18 @@ class NoCrossTest(CIBaseTest):
except exceptions.TestFail:
self.cancel('KFAIL')

+ def test_nocross_sid(self):
+ targets = [
+ 'mc:qemuamd64-sid:isar-image-base',
+ 'mc:qemuarm64-sid:isar-image-base',
+ ]
+
+ self.init()
+ try:
+ self.perform_build_test(targets, cross=False)
+ except exceptions.TestFail:
+ self.cancel('KFAIL')
+

class ContainerImageTest(CIBaseTest):

--
2.34.1

[Anton Mikanovich]

From: Maria Selvam <mar...@ilbers.de>

On "3.0 native" format deb package, by default the VCS related
files are removed. There is NO need to add DPKG_SOURCE_EXTRA_ARGS
parameter explicitly.

Signed-off-by: Maria Selvam <mar...@ilbers.de>
---

testsuite/cibase.py | 14 +++++++++++++-
testsuite/citest.py | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/testsuite/cibase.py b/testsuite/cibase.py
index 075535b1..6ffedcea 100755
--- a/testsuite/cibase.py
+++ b/testsuite/cibase.py
@@ -5,6 +5,7 @@ import os
import re
import shutil
import tempfile
+import tarfile

from cibuilder import CIBuilder, isar_root
from utils import CIUtils
@@ -305,6 +306,16 @@ class CIBaseTest(CIBuilder):
self.fail("Failed rebuild package and image")

def perform_source_test(self, targets, **kwargs):
+ def is_deb_quilt_package(tar_path):
+ with tarfile.open(tar_path) as tar:
+ is_quilt_package = True
+ for member in tar.getnames():
+ if '/debian/source/format' in member:
+ file_data = tar.extractfile(member).read()
+ if b'3.0 (native)' in file_data:
+ is_quilt_package = False
+ return is_quilt_package
+
def get_source_content(targets):
sfiles = dict()
for target in targets:
@@ -316,7 +327,8 @@ class CIBaseTest(CIBuilder):
if len(targz) < 1:
self.fail("No source packages found")
for fname in targz:
- sfiles[target][fname] = CIUtils.get_tar_content(fname)
+ if is_deb_quilt_package(fname):
+ sfiles[target][fname] = CIUtils.get_tar_content(fname)
return sfiles

self.configure(**kwargs)
diff --git a/testsuite/citest.py b/testsuite/citest.py
index e2ce45d1..56ac1f52 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -473,7 +473,7 @@ class SourceTest(CIBaseTest):
"""
Source contents test

- :avocado: tags=source
+ :avocado: tags=source,full
"""

def test_source(self):
--
2.34.1

[Uladzimir Bely]

Applied to next.

--
Best regards,
Uladzimir.