From 8eb71484d9df43672a1eeddf7be0e7c2eeb44d4d Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Fri, 19 Nov 2021 15:27:18 +0100 Subject: [PATCH] RHEL-8.6: fix package set of the image-installer image type The commit adding distro-specific package set to RHEL-8.6 [1] introduced a bug in the `image-installer` image type due to a typo. The `insights-client` package have been removed from the `bareMetalPackageSet` and moved to `distroSpecificPackageSet`. However the `distroBuildPackageSet` got appended to `bareMetalPackageSet`, instead of `distroSpecificPackageSet`, which caused `insights-client` to be removed from the image's package set. This issue have been found by the test case which tests manifests from image test cases, including the package set depsolving. [1] https://github.com/osbuild/osbuild-composer/commit/ed0cb5ea24c5aefc938a61758408459d068cd630# Signed-off-by: Tomas Hozza --- internal/distro/rhel86/package_sets.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/distro/rhel86/package_sets.go b/internal/distro/rhel86/package_sets.go index 1c7793515..4541a4a5a 100644 --- a/internal/distro/rhel86/package_sets.go +++ b/internal/distro/rhel86/package_sets.go @@ -498,7 +498,7 @@ func bareMetalPackageSet(t *imageType) rpmmd.PackageSet { "subscription-manager-cockpit", "tar", "tcpdump", "yum", }, Exclude: nil, - }.Append(bootPackageSet(t)).Append(distroBuildPackageSet(t)) + }.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t)) } // packages that are only in some (sub)-distributions