new file mode 100644
@@ -0,0 +1,18 @@
+Source: test-variants
+Section: misc
+Priority: optional
+Maintainer: isar-users <isar-users@googlegroups.com>
+Build-Depends: debhelper-compat (= 10),
+Standards-Version: 4.1.3
+
+Package: test-variants
+Architecture: any
+Build-Profiles: <pkg.test-variants.base>
+Description: Binary package of the base recipe
+ Built by the base recipe only.
+
+Package: test-variants-extra
+Architecture: any
+Build-Profiles: <pkg.test-variants.extra>
+Description: Binary package of the -kbuildtarget variant
+ Built by the -kbuildtarget variant only.
new file mode 100644
@@ -0,0 +1,25 @@
+# This software is a part of Isar.
+# Copyright (C) 2026 Siemens AG
+#
+# SPDX-License-Identifier: MIT
+#
+# test package built in two variants that share one source package name and
+# one architecture, as the kernel recipes do via kbuildtarget.bbclass. Each
+# variant produces a differently named binary package, so a cleanup that keys
+# on the source package instead of the recipe is visible in isar-apt.
+DPKG_ARCH = "any"
+SRC_URI = "file://control"
+
+MAINTAINER = "isar-users <isar-users@googlegroups.com>"
+
+inherit dpkg-raw
+inherit kbuildtarget
+
+BBCLASSEXTEND = "kbuildtarget"
+
+DEB_BUILD_PROFILES = "pkg.${BPN}.base"
+DEB_BUILD_PROFILES:class-kbuildtarget = "pkg.${BPN}.extra"
+
+do_prepare_build:append() {
+ cp ${WORKDIR}/control ${S}/debian/
+}
@@ -115,6 +115,19 @@ class CIBaseTest(CIBuilder):
with open(config_filename, 'w') as f:
yaml.dump(cfg, f)
+ def isar_apt_packages(self, distro):
+ """Names of the binary packages currently registered in isar-apt."""
+ self.check_init()
+ pattern = os.path.join(self.build_dir, 'tmp', 'deploy', 'isar-apt',
+ distro, '**', 'Packages')
+ packages = set()
+ for index in glob.glob(pattern, recursive=True):
+ with open(index) as f:
+ for line in f:
+ if line.startswith('Package:'):
+ packages.add(line.split(':', 1)[1].strip())
+ return packages
+
def perform_wic_partition_test(self, targets, wic_deploy_parts, **kwargs):
lines = kwargs.get('lines', [])
lines += [
@@ -194,6 +194,26 @@ class RepositoryTest(CIBaseTest):
bitbake_cmd='do_rootfs_install',
)
+ def test_repository_shared_source(self):
+ """
+ Test that recipe variants sharing a source package and an
+ architecture keep each other's binary packages in isar-apt.
+ """
+ targets = [
+ 'mc:qemuamd64-trixie:test-variants',
+ 'mc:qemuamd64-trixie:test-variants-kbuildtarget',
+ ]
+
+ self.init()
+ self.delete_from_build_dir('tmp')
+ self.perform_build_test(targets)
+
+ distro = CIUtils.getVars('DISTRO', target=targets[0])
+ packages = self.isar_apt_packages(distro)
+ for package in ('test-variants', 'test-variants-extra'):
+ self.assertIn(package, packages,
+ f"{package} is missing from isar-apt")
+
class SbuildFlavor(CIBaseTest):
"""
Test package built in two variants that share one source package name and one architecture, as the kernel recipes do via kbuildtarget.bbclass. Each variant produces a differently named binary package, so a cleanup that keys on the source package instead of the recipe is visible in isar-apt. Regression test for fd0d030a and 1182a45b. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- .../recipes-app/test-variants/files/control | 18 +++++++++++++ .../test-variants/test-variants.bb | 25 +++++++++++++++++++ testsuite/cibase.py | 13 ++++++++++ testsuite/citest.py | 20 +++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 meta-test/recipes-app/test-variants/files/control create mode 100644 meta-test/recipes-app/test-variants/test-variants.bb