particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel: don't extend image pkg sets with boot packages

Browse source 
Do not extend the image base package set with list of packages needed
for booting the OS, returned by `bootPackageSet()` based on the specific
image type, architecture and its boot type. This duplicated
functionality that is already handled by the platform associated image
and all the necessary packages are provided by the platform's
`GetPackages()` method and added to the base package list.

This reflects changes which were done in Fedora when it was ported to
the "new" image definitions, but were not ported to RHEL.

RHEL-8 GCE image type note:
After a previous change, the image boot type is now determined by the
associated platform and as a result, the GCE image type is marked as
supporting hybrid boot type, although it was meant to be UEFI only. As a
result, the package list returned by `bootPackageSet()` and previously
appended would contain grub2 BIOS-related packages. This is still the
case after this change, because the platform's `GetPackages()` method
will return the same list of packages in this case. However, the
platform used by RHEL-8 GCE image type has its `GetPackages()`
overridden by a different implementation not containing grub2 BIOS
related packages. For some reason, this change is not present in RHEL-9.
As a result, the grub2 BIOS related packages disappeared from the RHEL-8
GCE image package set, while there was no change in RHEL-9.

Keep the GCE image as is for now and make it an UEFI-only in a follow
up.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-05-17 16:50:01 +02:00 • committed by Achilleas Koutsou
parent 3569936aba
commit dd26769abc
34 changed files with 16 additions and 668 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel7/azure.go
View file

@ -257,7 +257,7 @@ func azureRhuiCommonPackageSet(t *imageType) rpmmd.PackageSet {
"NetworkManager-config-server",
"postfix",
},
}.Append(bootPackageSet(t))
}
if t.arch.distro.isRHEL() {
ps = ps.Append(rpmmd.PackageSet{

65
internal/distro/rhel7/package_sets.go
View file

@ -1,74 +1,9 @@
package rhel7
import (
"fmt"
"github.com/osbuild/osbuild-composer/internal/distro"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
)
// BOOT PACKAGE SETS
func bootPackageSet(t *imageType) rpmmd.PackageSet {
if !t.bootable {
return rpmmd.PackageSet{}
}
var addLegacyBootPkg bool
var addUEFIBootPkg bool
switch bt := t.getBootType(); bt {
case distro.LegacyBootType:
addLegacyBootPkg = true
case distro.UEFIBootType:
addUEFIBootPkg = true
case distro.HybridBootType:
addLegacyBootPkg = true
addUEFIBootPkg = true
default:
panic(fmt.Sprintf("unsupported boot type: %q", bt))
}
ps := rpmmd.PackageSet{}
switch t.arch.Name() {
case distro.X86_64ArchName:
if addLegacyBootPkg {
ps = ps.Append(x8664LegacyBootPackageSet(t))
}
if addUEFIBootPkg {
ps = ps.Append(x8664UEFIBootPackageSet(t))
}
default:
panic(fmt.Sprintf("unsupported boot arch: %s", t.arch.Name()))
}
return ps
}
// x86_64 Legacy arch-specific boot package set
func x8664LegacyBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"grub2-pc",
},
}
}
// x86_64 UEFI arch-specific boot package set
func x8664UEFIBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"efibootmgr",
"grub2-efi-x64",
"shim-x64",
},
}
}
// packages that are only in some (sub)-distributions
func distroSpecificPackageSet(t *imageType) rpmmd.PackageSet {
if t.arch.distro.isRHEL() {

2
internal/distro/rhel7/qcow2.go
View file

@ -119,7 +119,7 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
"libertas-sd8787-firmware",
"libertas-usb8388-firmware",
},
}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(distroSpecificPackageSet(t))
return ps
}

2
internal/distro/rhel8/ami.go
View file

@ -391,7 +391,7 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
// RHBZ#2075815
"qemu-guest-agent",
},
}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(distroSpecificPackageSet(t))
}
// common rhel ec2 RHUI image package set

2
internal/distro/rhel8/azure.go
View file

@ -194,7 +194,7 @@ func azureCommonPackageSet(t *imageType) rpmmd.PackageSet {
"rhnsd",
"usb_modeswitch",
},
}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(distroSpecificPackageSet(t))
if t.arch.distro.isRHEL() {
ps.Append(rpmmd.PackageSet{

2
internal/distro/rhel8/bare_metal.go
View file

@ -94,7 +94,7 @@ func bareMetalPackageSet(t *imageType) rpmmd.PackageSet {
"yum",
},
Exclude: nil,
}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(distroSpecificPackageSet(t))
// Ensure to not pull in subscription-manager on non-RHEL distro
if t.arch.distro.isRHEL() {

2
internal/distro/rhel8/edge.go
View file

@ -216,8 +216,6 @@ func edgeCommitPackageSet(t *imageType) rpmmd.PackageSet {
Exclude: []string{"rng-tools"},
}
ps = ps.Append(bootPackageSet(t))
switch t.arch.Name() {
case distro.X86_64ArchName:
ps = ps.Append(x8664EdgeCommitPackageSet(t))

2
internal/distro/rhel8/gce.go
View file

@ -279,7 +279,7 @@ func gceCommonPackageSet(t *imageType) rpmmd.PackageSet {
// RHBZ#2075815
"qemu-guest-agent",
},
}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(distroSpecificPackageSet(t))
}
// GCE BYOS image

103
internal/distro/rhel8/package_sets.go
View file

@ -64,109 +64,6 @@ func anacondaBootPackageSet(t *imageType) rpmmd.PackageSet {
return ps
}
// BOOT PACKAGE SETS
func bootPackageSet(t *imageType) rpmmd.PackageSet {
if !t.bootable {
return rpmmd.PackageSet{}
}
var addLegacyBootPkg bool
var addUEFIBootPkg bool
switch bt := t.getBootType(); bt {
case distro.LegacyBootType:
addLegacyBootPkg = true
case distro.UEFIBootType:
addUEFIBootPkg = true
case distro.HybridBootType:
addLegacyBootPkg = true
addUEFIBootPkg = true
default:
panic(fmt.Sprintf("unsupported boot type: %q", bt))
}
ps := rpmmd.PackageSet{}
switch t.arch.Name() {
case distro.X86_64ArchName:
if addLegacyBootPkg {
ps = ps.Append(x8664LegacyBootPackageSet(t))
}
if addUEFIBootPkg {
ps = ps.Append(x8664UEFIBootPackageSet(t))
}
case distro.Aarch64ArchName:
ps = ps.Append(aarch64UEFIBootPackageSet(t))
case distro.Ppc64leArchName:
ps = ps.Append(ppc64leLegacyBootPackageSet(t))
case distro.S390xArchName:
ps = ps.Append(s390xLegacyBootPackageSet(t))
default:
panic(fmt.Sprintf("unsupported boot arch: %s", t.arch.Name()))
}
return ps
}
// x86_64 Legacy arch-specific boot package set
func x8664LegacyBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"grub2-pc",
},
}
}
// x86_64 UEFI arch-specific boot package set
func x8664UEFIBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"efibootmgr",
"grub2-efi-x64",
"shim-x64",
},
}
}
// aarch64 UEFI arch-specific boot package set
func aarch64UEFIBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"efibootmgr",
"grub2-efi-aa64",
"grub2-tools",
"shim-aa64",
},
}
}
// ppc64le Legacy arch-specific boot package set
func ppc64leLegacyBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"grub2-ppc64le",
"grub2-ppc64le-modules",
"powerpc-utils",
},
}
}
// s390x Legacy arch-specific boot package set
func s390xLegacyBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{"dracut-config-generic", "s390utils-base"},
}
}
// packages that are only in some (sub)-distributions
func distroSpecificPackageSet(t *imageType) rpmmd.PackageSet {
if t.arch.distro.isRHEL() {

5
internal/distro/rhel8/qcow2.go
View file

@ -136,7 +136,7 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
"rng-tools",
"udisks2",
},
}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(distroSpecificPackageSet(t))
// Ensure to not pull in subscription-manager on non-RHEL distro
if t.arch.distro.isRHEL() {
@ -163,6 +163,5 @@ func openstackCommonPackageSet(t *imageType) rpmmd.PackageSet {
Exclude: []string{
"dracut-config-rescue", "rng-tools",
},
}.Append(bootPackageSet(t))
}
}

3
internal/distro/rhel8/vmdk.go
View file

@ -39,6 +39,5 @@ func vmdkCommonPackageSet(t *imageType) rpmmd.PackageSet {
"dracut-config-rescue",
"rng-tools",
},
}.Append(bootPackageSet(t))
}
}

2
internal/distro/rhel9/ami.go
View file

@ -328,7 +328,7 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
// RHBZ#2075815
"qemu-guest-agent",
},
}.Append(bootPackageSet(t)).Append(coreOsCommonPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(coreOsCommonPackageSet(t)).Append(distroSpecificPackageSet(t))
}
// common rhel ec2 RHUI image package set

2
internal/distro/rhel9/azure.go
View file

@ -145,7 +145,7 @@ func azureCommonPackageSet(t *imageType) rpmmd.PackageSet {
"rhnsd",
"usb_modeswitch",
},
}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(distroSpecificPackageSet(t))
if t.arch.distro.isRHEL() {
ps.Append(rpmmd.PackageSet{

2
internal/distro/rhel9/bare_metal.go
View file

@ -83,7 +83,7 @@ func bareMetalPackageSet(t *imageType) rpmmd.PackageSet {
"tar",
"tcpdump",
},
}.Append(bootPackageSet(t)).Append(coreOsCommonPackageSet(t)).Append(distroBuildPackageSet(t))
}.Append(coreOsCommonPackageSet(t)).Append(distroBuildPackageSet(t))
// Ensure to not pull in subscription-manager on non-RHEL distro
if t.arch.distro.isRHEL() {

2
internal/distro/rhel9/edge.go
View file

@ -373,8 +373,6 @@ func edgeCommitPackageSet(t *imageType) rpmmd.PackageSet {
},
}
ps = ps.Append(bootPackageSet(t))
switch t.arch.Name() {
case distro.X86_64ArchName:
ps = ps.Append(x8664EdgeCommitPackageSet(t))

2
internal/distro/rhel9/gce.go
View file

@ -274,7 +274,7 @@ func gceCommonPackageSet(t *imageType) rpmmd.PackageSet {
// RHBZ#2075815
"qemu-guest-agent",
},
}.Append(bootPackageSet(t)).Append(coreOsCommonPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(coreOsCommonPackageSet(t)).Append(distroSpecificPackageSet(t))
// Some excluded packages are part of the @core group package set returned
// by coreOsCommonPackageSet(). Ensure that the conflicting packages are

106
internal/distro/rhel9/package_sets.go
View file

@ -116,112 +116,6 @@ func anacondaBootPackageSet(t *imageType) rpmmd.PackageSet {
return ps
}
// BOOT PACKAGE SETS
func bootPackageSet(t *imageType) rpmmd.PackageSet {
if !t.bootable {
return rpmmd.PackageSet{}
}
var addLegacyBootPkg bool
var addUEFIBootPkg bool
switch bt := t.getBootType(); bt {
case distro.LegacyBootType:
addLegacyBootPkg = true
case distro.UEFIBootType:
addUEFIBootPkg = true
case distro.HybridBootType:
addLegacyBootPkg = true
addUEFIBootPkg = true
default:
panic(fmt.Sprintf("unsupported boot type: %q", bt))
}
ps := rpmmd.PackageSet{}
switch t.arch.Name() {
case distro.X86_64ArchName:
if addLegacyBootPkg {
ps = ps.Append(x8664LegacyBootPackageSet(t))
}
if addUEFIBootPkg {
ps = ps.Append(x8664UEFIBootPackageSet(t))
}
case distro.Aarch64ArchName:
ps = ps.Append(aarch64UEFIBootPackageSet(t))
case distro.Ppc64leArchName:
ps = ps.Append(ppc64leLegacyBootPackageSet(t))
case distro.S390xArchName:
ps = ps.Append(s390xLegacyBootPackageSet(t))
default:
panic(fmt.Sprintf("unsupported boot arch: %s", t.arch.Name()))
}
return ps
}
// x86_64 Legacy arch-specific boot package set
func x8664LegacyBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"grub2-pc",
},
}
}
// x86_64 UEFI arch-specific boot package set
func x8664UEFIBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"efibootmgr",
"grub2-efi-x64",
"shim-x64",
},
}
}
// aarch64 UEFI arch-specific boot package set
func aarch64UEFIBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"efibootmgr",
"grub2-efi-aa64",
"grub2-tools",
"shim-aa64",
},
}
}
// ppc64le Legacy arch-specific boot package set
func ppc64leLegacyBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"powerpc-utils",
"grub2-ppc64le",
"grub2-ppc64le-modules",
},
}
}
// s390x Legacy arch-specific boot package set
func s390xLegacyBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"s390utils-base",
},
}
}
// OS package sets
// Replacement of the previously used @core package group

4
internal/distro/rhel9/qcow2.go
View file

@ -71,7 +71,7 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
"rng-tools",
"udisks2",
},
}.Append(bootPackageSet(t)).Append(coreOsCommonPackageSet(t)).Append(distroSpecificPackageSet(t))
}.Append(coreOsCommonPackageSet(t)).Append(distroSpecificPackageSet(t))
// Ensure to not pull in subscription-manager on non-RHEL distro
if t.arch.distro.isRHEL() {
@ -100,7 +100,7 @@ func openstackCommonPackageSet(t *imageType) rpmmd.PackageSet {
Exclude: []string{
"rng-tools",
},
}.Append(bootPackageSet(t)).Append(coreOsCommonPackageSet(t))
}.Append(coreOsCommonPackageSet(t))
if t.arch.Name() == distro.X86_64ArchName {
ps = ps.Append(rpmmd.PackageSet{

2
internal/distro/rhel9/vmdk.go
View file

@ -38,7 +38,7 @@ func vmdkCommonPackageSet(t *imageType) rpmmd.PackageSet {
Exclude: []string{
"rng-tools",
},
}.Append(bootPackageSet(t)).Append(coreOsCommonPackageSet(t))
}.Append(coreOsCommonPackageSet(t))
if t.arch.Name() == distro.X86_64ArchName {
ps = ps.Append(rpmmd.PackageSet{

36
test/data/manifests/centos_8-x86_64-gce-boot.json
View file

@ -2311,22 +2311,6 @@
}
}
},
{
"id": "sha256:edd1ebdbe8fb3ab9cc3d3b4e9cff75e0f93a6772ebc74f5a05968835ab6c5d80",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:a0c36067187bb1133550f8ae24c92206f58eb85401540f79fa76c860b48c65d1",
"options": {
"metadata": {
"rpm.check_gpg": true
}
}
},
{
"id": "sha256:afaf03d88b0bf42a169d9fa06f9a7dd289a221d75bcb46447381eebb40507d16",
"options": {
@ -9279,26 +9263,6 @@
"checksum": "sha256:2c5427115265f27f104b0444a741336f5f1a86e4d8755d2ca1b675929a9775d2",
"check_gpg": true
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20220208/Packages/grub2-pc-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:edd1ebdbe8fb3ab9cc3d3b4e9cff75e0f93a6772ebc74f5a05968835ab6c5d80",
"check_gpg": true
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20220208/Packages/grub2-pc-modules-2.02-106.el8.noarch.rpm",
"checksum": "sha256:a0c36067187bb1133550f8ae24c92206f58eb85401540f79fa76c860b48c65d1",
"check_gpg": true
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_8-x86_64-gce-boot.json
View file

@ -915,12 +915,6 @@
{
"id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69"
},
@ -6190,24 +6184,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm",
"checksum": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json
View file

@ -915,12 +915,6 @@
{
"id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69"
},
@ -6204,24 +6198,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm",
"checksum": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_84-x86_64-gce-boot.json
View file

@ -939,12 +939,6 @@
{
"id": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
},
{
"id": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17"
},
{
"id": "sha256:e5815c2cc496b8529dac4e16781752a6f09405ef803213401016e4170a565e6d"
},
{
"id": "sha256:30f3eca78f87fb66d9797a252df9217ec755e7a9034edf44deec5943dde4ba54"
},
@ -6309,24 +6303,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-efi-x64-2.02-99.el8.x86_64.rpm",
"checksum": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "99.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-pc-2.02-99.el8.x86_64.rpm",
"checksum": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "99.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-pc-modules-2.02-99.el8.noarch.rpm",
"checksum": "sha256:e5815c2cc496b8529dac4e16781752a6f09405ef803213401016e4170a565e6d"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
View file

@ -939,12 +939,6 @@
{
"id": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
},
{
"id": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17"
},
{
"id": "sha256:e5815c2cc496b8529dac4e16781752a6f09405ef803213401016e4170a565e6d"
},
{
"id": "sha256:30f3eca78f87fb66d9797a252df9217ec755e7a9034edf44deec5943dde4ba54"
},
@ -6323,24 +6317,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-efi-x64-2.02-99.el8.x86_64.rpm",
"checksum": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "99.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-pc-2.02-99.el8.x86_64.rpm",
"checksum": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "99.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-pc-modules-2.02-99.el8.noarch.rpm",
"checksum": "sha256:e5815c2cc496b8529dac4e16781752a6f09405ef803213401016e4170a565e6d"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_85-x86_64-gce-boot.json
View file

@ -912,12 +912,6 @@
{
"id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
},
{
"id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
},
{
"id": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5"
},
{
"id": "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a"
},
@ -6196,24 +6190,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-pc-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-pc-modules-2.02-106.el8.noarch.rpm",
"checksum": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
View file

@ -912,12 +912,6 @@
{
"id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
},
{
"id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
},
{
"id": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5"
},
{
"id": "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a"
},
@ -6210,24 +6204,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-pc-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-pc-modules-2.02-106.el8.noarch.rpm",
"checksum": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_86-x86_64-gce-boot.json
View file

@ -912,12 +912,6 @@
{
"id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
},
{
"id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
},
{
"id": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5"
},
{
"id": "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a"
},
@ -6193,24 +6187,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-pc-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-pc-modules-2.02-106.el8.noarch.rpm",
"checksum": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
View file

@ -912,12 +912,6 @@
{
"id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
},
{
"id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
},
{
"id": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5"
},
{
"id": "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a"
},
@ -6207,24 +6201,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-pc-2.02-106.el8.x86_64.rpm",
"checksum": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "106.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-pc-modules-2.02-106.el8.noarch.rpm",
"checksum": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_87-x86_64-gce-boot.json
View file

@ -915,12 +915,6 @@
{
"id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69"
},
@ -6190,24 +6184,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm",
"checksum": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
View file

@ -915,12 +915,6 @@
{
"id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69"
},
@ -6204,24 +6198,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm",
"checksum": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_88-x86_64-gce-boot.json
View file

@ -915,12 +915,6 @@
{
"id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69"
},
@ -6190,24 +6184,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-pc-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm",
"checksum": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json
View file

@ -915,12 +915,6 @@
{
"id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69"
},
@ -6204,24 +6198,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-pc-2.02-142.el8.x86_64.rpm",
"checksum": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "142.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm",
"checksum": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_89-x86_64-gce-boot.json
View file

@ -918,12 +918,6 @@
{
"id": "sha256:ec11f97cb99d570492c82c905bbc5db63c708f103fa9bce4795abd6e5e995af6"
},
{
"id": "sha256:22909cc299d99e00957387024a9c9f0df4605cd29a62470bf07f396dd9711a8c"
},
{
"id": "sha256:dacc06a1c2f75999a325ca585e5d08b72b1f141d62f52fc03af8a4f49ab1901a"
},
{
"id": "sha256:91355e995ab2fb09780c27c68fb489dd77500a8a542cd6f14bcffcba3d34430a"
},
@ -6241,24 +6235,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/grub2-efi-x64-2.02-148.el8.x86_64.rpm",
"checksum": "sha256:ec11f97cb99d570492c82c905bbc5db63c708f103fa9bce4795abd6e5e995af6"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "148.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/grub2-pc-2.02-148.el8.x86_64.rpm",
"checksum": "sha256:22909cc299d99e00957387024a9c9f0df4605cd29a62470bf07f396dd9711a8c"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "148.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/grub2-pc-modules-2.02-148.el8.noarch.rpm",
"checksum": "sha256:dacc06a1c2f75999a325ca585e5d08b72b1f141d62f52fc03af8a4f49ab1901a"
},
{
"name": "grub2-tools",
"epoch": 1,

24
test/data/manifests/rhel_89-x86_64-gce_rhui-boot.json
View file

@ -918,12 +918,6 @@
{
"id": "sha256:ec11f97cb99d570492c82c905bbc5db63c708f103fa9bce4795abd6e5e995af6"
},
{
"id": "sha256:22909cc299d99e00957387024a9c9f0df4605cd29a62470bf07f396dd9711a8c"
},
{
"id": "sha256:dacc06a1c2f75999a325ca585e5d08b72b1f141d62f52fc03af8a4f49ab1901a"
},
{
"id": "sha256:91355e995ab2fb09780c27c68fb489dd77500a8a542cd6f14bcffcba3d34430a"
},
@ -6255,24 +6249,6 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/grub2-efi-x64-2.02-148.el8.x86_64.rpm",
"checksum": "sha256:ec11f97cb99d570492c82c905bbc5db63c708f103fa9bce4795abd6e5e995af6"
},
{
"name": "grub2-pc",
"epoch": 1,
"version": "2.02",
"release": "148.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/grub2-pc-2.02-148.el8.x86_64.rpm",
"checksum": "sha256:22909cc299d99e00957387024a9c9f0df4605cd29a62470bf07f396dd9711a8c"
},
{
"name": "grub2-pc-modules",
"epoch": 1,
"version": "2.02",
"release": "148.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/grub2-pc-modules-2.02-148.el8.noarch.rpm",
"checksum": "sha256:dacc06a1c2f75999a325ca585e5d08b72b1f141d62f52fc03af8a4f49ab1901a"
},
{
"name": "grub2-tools",
"epoch": 1,