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] ed0cb5ea24#

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-11-19 15:27:18 +01:00 committed by Achilleas Koutsou
parent c5a4946135
commit 8eb71484d9

View file

@ -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