From dd6f9fdbcf05122106256b7619d061326fc95851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Wed, 17 May 2023 12:58:22 +0200 Subject: [PATCH] distro/rhel: remove bootType from imageType and architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the bootType from imageType and architecture structures and determine the image boot type based on its associated platform. This reflects changes which were done in Fedora when it was ported to the "new" image definitions, but were not ported to RHEL. GCE image type note: This change has a side-effect on the GCE image type. It was meant to be UEFI only, but the previous mixture of bootType set in the imageType and the platform used for it made it a weird combination of almost hybrid boot type, but not completely. For now, the grub2 BIOS-related packages are added to the image content as a result. Eventually, the platform used for the image should be changed to not support BIOS and the image should also not have BIOS partition at all. Signed-off-by: Tomáš Hozza --- internal/distro/rhel7/distro.go | 24 ++++++------- internal/distro/rhel8/ami.go | 4 --- internal/distro/rhel8/arch.go | 1 - internal/distro/rhel8/distro.go | 25 ++++++------- internal/distro/rhel8/gce.go | 2 -- internal/distro/rhel8/imagetype.go | 16 ++++----- internal/distro/rhel9/ami.go | 4 --- internal/distro/rhel9/arch.go | 1 - internal/distro/rhel9/distro.go | 25 ++++++------- internal/distro/rhel9/gce.go | 2 -- internal/distro/rhel9/imagetype.go | 16 ++++----- .../manifests/centos_8-x86_64-gce-boot.json | 36 +++++++++++++++++++ .../manifests/rhel_8-x86_64-gce-boot.json | 24 +++++++++++++ .../rhel_8-x86_64-gce_rhui-boot.json | 24 +++++++++++++ .../manifests/rhel_84-x86_64-gce-boot.json | 24 +++++++++++++ .../rhel_84-x86_64-gce_rhui-boot.json | 24 +++++++++++++ .../manifests/rhel_85-x86_64-gce-boot.json | 24 +++++++++++++ .../rhel_85-x86_64-gce_rhui-boot.json | 24 +++++++++++++ .../manifests/rhel_86-x86_64-gce-boot.json | 24 +++++++++++++ .../rhel_86-x86_64-gce_rhui-boot.json | 24 +++++++++++++ .../manifests/rhel_87-x86_64-gce-boot.json | 24 +++++++++++++ .../rhel_87-x86_64-gce_rhui-boot.json | 24 +++++++++++++ .../manifests/rhel_88-x86_64-gce-boot.json | 24 +++++++++++++ .../rhel_88-x86_64-gce_rhui-boot.json | 24 +++++++++++++ .../manifests/rhel_89-x86_64-gce-boot.json | 24 +++++++++++++ .../rhel_89-x86_64-gce_rhui-boot.json | 24 +++++++++++++ 26 files changed, 421 insertions(+), 71 deletions(-) diff --git a/internal/distro/rhel7/distro.go b/internal/distro/rhel7/distro.go index ed0131588..5d74f398a 100644 --- a/internal/distro/rhel7/distro.go +++ b/internal/distro/rhel7/distro.go @@ -148,7 +148,6 @@ type architecture struct { imageTypes map[string]distro.ImageType imageTypeAliases map[string]string legacy string - bootType distro.BootType } func (a *architecture) Name() string { @@ -231,8 +230,6 @@ type imageType struct { // bootable image bootable bool - // If set to a value, it is preferred over the architecture value - bootType distro.BootType // List of valid arches for the image type basePartitionTables distro.BasePartitionTableMap } @@ -288,14 +285,16 @@ func (t *imageType) Exports() []string { return t.exports } -// getBootType returns the BootType which should be used for this particular -// combination of architecture and image type. +// getBootType returns the BootType which should be used for this particular image type func (t *imageType) getBootType() distro.BootType { - bootType := t.arch.bootType - if t.bootType != distro.UnsetBootType { - bootType = t.bootType + if t.platform.GetUEFIVendor() != "" && t.platform.GetBIOSPlatform() != "" { + return distro.HybridBootType + } else if t.platform.GetUEFIVendor() != "" { + return distro.UEFIBootType + } else if t.platform.GetBIOSPlatform() != "" || t.platform.GetZiplSupport() { + return distro.LegacyBootType } - return bootType + return distro.UnsetBootType } func (t *imageType) getPartitionTable( @@ -578,10 +577,9 @@ func newDistro(distroName string) distro.Distro { // Architecture definitions x86_64 := architecture{ - name: distro.X86_64ArchName, - distro: &rd, - legacy: "i386-pc", - bootType: distro.HybridBootType, + name: distro.X86_64ArchName, + distro: &rd, + legacy: "i386-pc", } x86_64.addImageTypes( diff --git a/internal/distro/rhel8/ami.go b/internal/distro/rhel8/ami.go index d2bc250f7..81a7a0f63 100644 --- a/internal/distro/rhel8/ami.go +++ b/internal/distro/rhel8/ami.go @@ -18,7 +18,6 @@ func amiImgTypeX86_64(rd distribution) imageType { defaultImageConfig: defaultAMIImageConfigX86_64(rd), kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", bootable: true, - bootType: distro.LegacyBootType, defaultSize: 10 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, @@ -42,7 +41,6 @@ func ec2ImgTypeX86_64(rd distribution) imageType { defaultImageConfig: defaultEc2ImageConfigX86_64(rd), kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", bootable: true, - bootType: distro.LegacyBootType, defaultSize: 10 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, @@ -65,7 +63,6 @@ func ec2HaImgTypeX86_64(rd distribution) imageType { defaultImageConfig: defaultEc2ImageConfigX86_64(rd), kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", bootable: true, - bootType: distro.LegacyBootType, defaultSize: 10 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, @@ -131,7 +128,6 @@ func ec2SapImgTypeX86_64(rd distribution) imageType { defaultImageConfig: defaultEc2SapImageConfigX86_64(rd), kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", bootable: true, - bootType: distro.LegacyBootType, defaultSize: 10 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, diff --git a/internal/distro/rhel8/arch.go b/internal/distro/rhel8/arch.go index 58be73ad5..aad738105 100644 --- a/internal/distro/rhel8/arch.go +++ b/internal/distro/rhel8/arch.go @@ -15,7 +15,6 @@ type architecture struct { imageTypes map[string]distro.ImageType imageTypeAliases map[string]string legacy string - bootType distro.BootType } func (a *architecture) Name() string { diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go index a6becd2df..e520bb258 100644 --- a/internal/distro/rhel8/distro.go +++ b/internal/distro/rhel8/distro.go @@ -194,28 +194,24 @@ func newDistro(name string, minor int) *distribution { // Architecture definitions x86_64 := architecture{ - name: distro.X86_64ArchName, - distro: &rd, - legacy: "i386-pc", - bootType: distro.HybridBootType, + name: distro.X86_64ArchName, + distro: &rd, + legacy: "i386-pc", } aarch64 := architecture{ - name: distro.Aarch64ArchName, - distro: &rd, - bootType: distro.UEFIBootType, + name: distro.Aarch64ArchName, + distro: &rd, } ppc64le := architecture{ - distro: &rd, - name: distro.Ppc64leArchName, - legacy: "powerpc-ieee1275", - bootType: distro.LegacyBootType, + distro: &rd, + legacy: "powerpc-ieee1275", + name: distro.Ppc64leArchName, } s390x := architecture{ - distro: &rd, - name: distro.S390xArchName, - bootType: distro.LegacyBootType, + distro: &rd, + name: distro.S390xArchName, } ociImgType := qcow2ImgType(rd) @@ -288,6 +284,7 @@ func newDistro(name string, minor int) *distribution { // TODO: review requirement for platform with overridden packages for GCE gceX86Platform := &gceX86{ X86: platform.X86{ + // TODO: BIOS should not be set to true for GCE, since it is meant to be UEFI only. BIOS: true, UEFIVendor: rd.vendor, BasePlatform: platform.BasePlatform{ diff --git a/internal/distro/rhel8/gce.go b/internal/distro/rhel8/gce.go index d1f1e2e6b..508277696 100644 --- a/internal/distro/rhel8/gce.go +++ b/internal/distro/rhel8/gce.go @@ -21,7 +21,6 @@ func gceImgType(rd distribution) imageType { defaultImageConfig: defaultGceByosImageConfig(rd), kernelOptions: gceKernelOptions, bootable: true, - bootType: distro.UEFIBootType, defaultSize: 20 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, @@ -42,7 +41,6 @@ func gceRhuiImgType(rd distribution) imageType { defaultImageConfig: defaultGceRhuiImageConfig(rd), kernelOptions: gceKernelOptions, bootable: true, - bootType: distro.UEFIBootType, defaultSize: 20 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, diff --git a/internal/distro/rhel8/imagetype.go b/internal/distro/rhel8/imagetype.go index ac53762be..489c1e940 100644 --- a/internal/distro/rhel8/imagetype.go +++ b/internal/distro/rhel8/imagetype.go @@ -69,8 +69,6 @@ type imageType struct { rpmOstree bool // bootable image bootable bool - // If set to a value, it is preferred over the architecture value - bootType distro.BootType // List of valid arches for the image type basePartitionTables distro.BasePartitionTableMap } @@ -133,14 +131,16 @@ func (t *imageType) Exports() []string { return []string{"assembler"} } -// getBootType returns the BootType which should be used for this particular -// combination of architecture and image type. +// getBootType returns the BootType which should be used for this particular image type func (t *imageType) getBootType() distro.BootType { - bootType := t.arch.bootType - if t.bootType != distro.UnsetBootType { - bootType = t.bootType + if t.platform.GetUEFIVendor() != "" && t.platform.GetBIOSPlatform() != "" { + return distro.HybridBootType + } else if t.platform.GetUEFIVendor() != "" { + return distro.UEFIBootType + } else if t.platform.GetBIOSPlatform() != "" || t.platform.GetZiplSupport() { + return distro.LegacyBootType } - return bootType + return distro.UnsetBootType } func (t *imageType) getPartitionTable( diff --git a/internal/distro/rhel9/ami.go b/internal/distro/rhel9/ami.go index 8c985c1b4..2280b0e32 100644 --- a/internal/distro/rhel9/ami.go +++ b/internal/distro/rhel9/ami.go @@ -19,7 +19,6 @@ var ( }, kernelOptions: amiKernelOptions, bootable: true, - bootType: distro.LegacyBootType, defaultSize: 10 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, @@ -38,7 +37,6 @@ var ( }, kernelOptions: amiKernelOptions, bootable: true, - bootType: distro.LegacyBootType, defaultSize: 10 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, @@ -58,7 +56,6 @@ var ( }, kernelOptions: amiKernelOptions, bootable: true, - bootType: distro.LegacyBootType, defaultSize: 10 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, @@ -115,7 +112,6 @@ var ( }, kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1", bootable: true, - bootType: distro.LegacyBootType, defaultSize: 10 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, diff --git a/internal/distro/rhel9/arch.go b/internal/distro/rhel9/arch.go index 446028797..c78480bb7 100644 --- a/internal/distro/rhel9/arch.go +++ b/internal/distro/rhel9/arch.go @@ -15,7 +15,6 @@ type architecture struct { imageTypes map[string]distro.ImageType imageTypeAliases map[string]string legacy string - bootType distro.BootType } func (a *architecture) Name() string { diff --git a/internal/distro/rhel9/distro.go b/internal/distro/rhel9/distro.go index 26a0b447d..7e16c0773 100644 --- a/internal/distro/rhel9/distro.go +++ b/internal/distro/rhel9/distro.go @@ -186,28 +186,24 @@ func newDistro(name string, minor int) *distribution { // Architecture definitions x86_64 := architecture{ - name: distro.X86_64ArchName, - distro: &rd, - legacy: "i386-pc", - bootType: distro.HybridBootType, + name: distro.X86_64ArchName, + distro: &rd, + legacy: "i386-pc", } aarch64 := architecture{ - name: distro.Aarch64ArchName, - distro: &rd, - bootType: distro.UEFIBootType, + name: distro.Aarch64ArchName, + distro: &rd, } ppc64le := architecture{ - distro: &rd, - name: distro.Ppc64leArchName, - legacy: "powerpc-ieee1275", - bootType: distro.LegacyBootType, + distro: &rd, + name: distro.Ppc64leArchName, + legacy: "powerpc-ieee1275", } s390x := architecture{ - distro: &rd, - name: distro.S390xArchName, - bootType: distro.LegacyBootType, + distro: &rd, + name: distro.S390xArchName, } qcow2ImgType := mkQcow2ImgType(rd) @@ -276,6 +272,7 @@ func newDistro(name string, minor int) *distribution { ) gceX86Platform := &platform.X86{ + // TODO: BIOS should not be set to true for GCE, since it is meant to be UEFI only. BIOS: true, UEFIVendor: rd.vendor, BasePlatform: platform.BasePlatform{ diff --git a/internal/distro/rhel9/gce.go b/internal/distro/rhel9/gce.go index ec21192f4..188272fa5 100644 --- a/internal/distro/rhel9/gce.go +++ b/internal/distro/rhel9/gce.go @@ -19,7 +19,6 @@ var ( }, kernelOptions: gceKernelOptions, bootable: true, - bootType: distro.UEFIBootType, defaultSize: 20 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, @@ -37,7 +36,6 @@ var ( }, kernelOptions: gceKernelOptions, bootable: true, - bootType: distro.UEFIBootType, defaultSize: 20 * common.GibiByte, image: liveImage, buildPipelines: []string{"build"}, diff --git a/internal/distro/rhel9/imagetype.go b/internal/distro/rhel9/imagetype.go index 62290c74a..08b52ca75 100644 --- a/internal/distro/rhel9/imagetype.go +++ b/internal/distro/rhel9/imagetype.go @@ -72,8 +72,6 @@ type imageType struct { rpmOstree bool // bootable image bootable bool - // If set to a value, it is preferred over the architecture value - bootType distro.BootType // List of valid arches for the image type basePartitionTables distro.BasePartitionTableMap } @@ -136,14 +134,16 @@ func (t *imageType) Exports() []string { return []string{"assembler"} } -// getBootType returns the BootType which should be used for this particular -// combination of architecture and image type. +// getBootType returns the BootType which should be used for this particular image type func (t *imageType) getBootType() distro.BootType { - bootType := t.arch.bootType - if t.bootType != distro.UnsetBootType { - bootType = t.bootType + if t.platform.GetUEFIVendor() != "" && t.platform.GetBIOSPlatform() != "" { + return distro.HybridBootType + } else if t.platform.GetUEFIVendor() != "" { + return distro.UEFIBootType + } else if t.platform.GetBIOSPlatform() != "" || t.platform.GetZiplSupport() { + return distro.LegacyBootType } - return bootType + return distro.UnsetBootType } func (t *imageType) getPartitionTable( diff --git a/test/data/manifests/centos_8-x86_64-gce-boot.json b/test/data/manifests/centos_8-x86_64-gce-boot.json index 389cb01ab..c8c5d3b70 100644 --- a/test/data/manifests/centos_8-x86_64-gce-boot.json +++ b/test/data/manifests/centos_8-x86_64-gce-boot.json @@ -2311,6 +2311,22 @@ } } }, + { + "id": "sha256:edd1ebdbe8fb3ab9cc3d3b4e9cff75e0f93a6772ebc74f5a05968835ab6c5d80", + "options": { + "metadata": { + "rpm.check_gpg": true + } + } + }, + { + "id": "sha256:a0c36067187bb1133550f8ae24c92206f58eb85401540f79fa76c860b48c65d1", + "options": { + "metadata": { + "rpm.check_gpg": true + } + } + }, { "id": "sha256:afaf03d88b0bf42a169d9fa06f9a7dd289a221d75bcb46447381eebb40507d16", "options": { @@ -9263,6 +9279,26 @@ "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, diff --git a/test/data/manifests/rhel_8-x86_64-gce-boot.json b/test/data/manifests/rhel_8-x86_64-gce-boot.json index 4ccdabf0d..b44a79626 100644 --- a/test/data/manifests/rhel_8-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_8-x86_64-gce-boot.json @@ -915,6 +915,12 @@ { "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b" }, + { + "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d" + }, + { + "id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc" + }, { "id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69" }, @@ -6184,6 +6190,24 @@ "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, diff --git a/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json index 430eaedf5..6a0f95731 100644 --- a/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json @@ -915,6 +915,12 @@ { "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b" }, + { + "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d" + }, + { + "id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc" + }, { "id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69" }, @@ -6198,6 +6204,24 @@ "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, diff --git a/test/data/manifests/rhel_84-x86_64-gce-boot.json b/test/data/manifests/rhel_84-x86_64-gce-boot.json index 375259326..ea5972b81 100644 --- a/test/data/manifests/rhel_84-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_84-x86_64-gce-boot.json @@ -939,6 +939,12 @@ { "id": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651" }, + { + "id": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17" + }, + { + "id": "sha256:e5815c2cc496b8529dac4e16781752a6f09405ef803213401016e4170a565e6d" + }, { "id": "sha256:30f3eca78f87fb66d9797a252df9217ec755e7a9034edf44deec5943dde4ba54" }, @@ -6303,6 +6309,24 @@ "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, diff --git a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json index e024476f0..2f169f22e 100644 --- a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json @@ -939,6 +939,12 @@ { "id": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651" }, + { + "id": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17" + }, + { + "id": "sha256:e5815c2cc496b8529dac4e16781752a6f09405ef803213401016e4170a565e6d" + }, { "id": "sha256:30f3eca78f87fb66d9797a252df9217ec755e7a9034edf44deec5943dde4ba54" }, @@ -6317,6 +6323,24 @@ "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, diff --git a/test/data/manifests/rhel_85-x86_64-gce-boot.json b/test/data/manifests/rhel_85-x86_64-gce-boot.json index e02e3b40b..7a1c4c9ae 100644 --- a/test/data/manifests/rhel_85-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_85-x86_64-gce-boot.json @@ -912,6 +912,12 @@ { "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7" }, + { + "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf" + }, + { + "id": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5" + }, { "id": "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a" }, @@ -6190,6 +6196,24 @@ "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, diff --git a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json index 675dfbd3d..a410799bd 100644 --- a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json @@ -912,6 +912,12 @@ { "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7" }, + { + "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf" + }, + { + "id": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5" + }, { "id": "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a" }, @@ -6204,6 +6210,24 @@ "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, diff --git a/test/data/manifests/rhel_86-x86_64-gce-boot.json b/test/data/manifests/rhel_86-x86_64-gce-boot.json index cd7027e04..265246198 100644 --- a/test/data/manifests/rhel_86-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_86-x86_64-gce-boot.json @@ -912,6 +912,12 @@ { "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7" }, + { + "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf" + }, + { + "id": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5" + }, { "id": "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a" }, @@ -6187,6 +6193,24 @@ "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, diff --git a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json index 3f1292bdc..57879f40f 100644 --- a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json @@ -912,6 +912,12 @@ { "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7" }, + { + "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf" + }, + { + "id": "sha256:bd914bf861187ec13b6fd6cecae6473f3c7b3ea64f710bc24157d66ad54216c5" + }, { "id": "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a" }, @@ -6201,6 +6207,24 @@ "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, diff --git a/test/data/manifests/rhel_87-x86_64-gce-boot.json b/test/data/manifests/rhel_87-x86_64-gce-boot.json index 530d80ff5..ecd20e9f5 100644 --- a/test/data/manifests/rhel_87-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_87-x86_64-gce-boot.json @@ -915,6 +915,12 @@ { "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b" }, + { + "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d" + }, + { + "id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc" + }, { "id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69" }, @@ -6184,6 +6190,24 @@ "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, diff --git a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json index 9de40e3cf..8ff675b42 100644 --- a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json @@ -915,6 +915,12 @@ { "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b" }, + { + "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d" + }, + { + "id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc" + }, { "id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69" }, @@ -6198,6 +6204,24 @@ "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, diff --git a/test/data/manifests/rhel_88-x86_64-gce-boot.json b/test/data/manifests/rhel_88-x86_64-gce-boot.json index e75066f2e..73253305c 100644 --- a/test/data/manifests/rhel_88-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_88-x86_64-gce-boot.json @@ -915,6 +915,12 @@ { "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b" }, + { + "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d" + }, + { + "id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc" + }, { "id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69" }, @@ -6184,6 +6190,24 @@ "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, diff --git a/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json index 7f324e279..8f3665e62 100644 --- a/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json @@ -915,6 +915,12 @@ { "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b" }, + { + "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d" + }, + { + "id": "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc" + }, { "id": "sha256:88c4ddfda5ccbb32056b9907ad816aeda45a829dfec701c482b31137a4c42b69" }, @@ -6198,6 +6204,24 @@ "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, diff --git a/test/data/manifests/rhel_89-x86_64-gce-boot.json b/test/data/manifests/rhel_89-x86_64-gce-boot.json index 7bc4d8f6d..49d891adb 100644 --- a/test/data/manifests/rhel_89-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_89-x86_64-gce-boot.json @@ -918,6 +918,12 @@ { "id": "sha256:ec11f97cb99d570492c82c905bbc5db63c708f103fa9bce4795abd6e5e995af6" }, + { + "id": "sha256:22909cc299d99e00957387024a9c9f0df4605cd29a62470bf07f396dd9711a8c" + }, + { + "id": "sha256:dacc06a1c2f75999a325ca585e5d08b72b1f141d62f52fc03af8a4f49ab1901a" + }, { "id": "sha256:91355e995ab2fb09780c27c68fb489dd77500a8a542cd6f14bcffcba3d34430a" }, @@ -6235,6 +6241,24 @@ "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, diff --git a/test/data/manifests/rhel_89-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_89-x86_64-gce_rhui-boot.json index d0d8e6ab9..2dda57e06 100644 --- a/test/data/manifests/rhel_89-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_89-x86_64-gce_rhui-boot.json @@ -918,6 +918,12 @@ { "id": "sha256:ec11f97cb99d570492c82c905bbc5db63c708f103fa9bce4795abd6e5e995af6" }, + { + "id": "sha256:22909cc299d99e00957387024a9c9f0df4605cd29a62470bf07f396dd9711a8c" + }, + { + "id": "sha256:dacc06a1c2f75999a325ca585e5d08b72b1f141d62f52fc03af8a4f49ab1901a" + }, { "id": "sha256:91355e995ab2fb09780c27c68fb489dd77500a8a542cd6f14bcffcba3d34430a" }, @@ -6249,6 +6255,24 @@ "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,