From dd26769abceb16619c7dfa021f7adc38c059c38a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Wed, 17 May 2023 16:50:01 +0200 Subject: [PATCH] distro/rhel: don't extend image pkg sets with boot packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- internal/distro/rhel7/azure.go | 2 +- internal/distro/rhel7/package_sets.go | 65 ----------- internal/distro/rhel7/qcow2.go | 2 +- internal/distro/rhel8/ami.go | 2 +- internal/distro/rhel8/azure.go | 2 +- internal/distro/rhel8/bare_metal.go | 2 +- internal/distro/rhel8/edge.go | 2 - internal/distro/rhel8/gce.go | 2 +- internal/distro/rhel8/package_sets.go | 103 ----------------- internal/distro/rhel8/qcow2.go | 5 +- internal/distro/rhel8/vmdk.go | 3 +- internal/distro/rhel9/ami.go | 2 +- internal/distro/rhel9/azure.go | 2 +- internal/distro/rhel9/bare_metal.go | 2 +- internal/distro/rhel9/edge.go | 2 - internal/distro/rhel9/gce.go | 2 +- internal/distro/rhel9/package_sets.go | 106 ------------------ internal/distro/rhel9/qcow2.go | 4 +- internal/distro/rhel9/vmdk.go | 2 +- .../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 ---- 34 files changed, 16 insertions(+), 668 deletions(-) diff --git a/internal/distro/rhel7/azure.go b/internal/distro/rhel7/azure.go index 24e8bba4c..56942f798 100644 --- a/internal/distro/rhel7/azure.go +++ b/internal/distro/rhel7/azure.go @@ -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{ diff --git a/internal/distro/rhel7/package_sets.go b/internal/distro/rhel7/package_sets.go index 00c576ce6..8615065d1 100644 --- a/internal/distro/rhel7/package_sets.go +++ b/internal/distro/rhel7/package_sets.go @@ -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() { diff --git a/internal/distro/rhel7/qcow2.go b/internal/distro/rhel7/qcow2.go index 7cfcab9ba..8f913cf3d 100644 --- a/internal/distro/rhel7/qcow2.go +++ b/internal/distro/rhel7/qcow2.go @@ -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 } diff --git a/internal/distro/rhel8/ami.go b/internal/distro/rhel8/ami.go index 81a7a0f63..db4bee7fe 100644 --- a/internal/distro/rhel8/ami.go +++ b/internal/distro/rhel8/ami.go @@ -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 diff --git a/internal/distro/rhel8/azure.go b/internal/distro/rhel8/azure.go index f22545195..19d39e7d2 100644 --- a/internal/distro/rhel8/azure.go +++ b/internal/distro/rhel8/azure.go @@ -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{ diff --git a/internal/distro/rhel8/bare_metal.go b/internal/distro/rhel8/bare_metal.go index b5ad9d0c8..2ca06e257 100644 --- a/internal/distro/rhel8/bare_metal.go +++ b/internal/distro/rhel8/bare_metal.go @@ -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() { diff --git a/internal/distro/rhel8/edge.go b/internal/distro/rhel8/edge.go index 6b8b6abfc..385d07b79 100644 --- a/internal/distro/rhel8/edge.go +++ b/internal/distro/rhel8/edge.go @@ -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)) diff --git a/internal/distro/rhel8/gce.go b/internal/distro/rhel8/gce.go index 508277696..0c4d47f4d 100644 --- a/internal/distro/rhel8/gce.go +++ b/internal/distro/rhel8/gce.go @@ -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 diff --git a/internal/distro/rhel8/package_sets.go b/internal/distro/rhel8/package_sets.go index 07d9aeb6e..45bde45fa 100644 --- a/internal/distro/rhel8/package_sets.go +++ b/internal/distro/rhel8/package_sets.go @@ -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() { diff --git a/internal/distro/rhel8/qcow2.go b/internal/distro/rhel8/qcow2.go index a232cc402..fb76e36ec 100644 --- a/internal/distro/rhel8/qcow2.go +++ b/internal/distro/rhel8/qcow2.go @@ -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)) - + } } diff --git a/internal/distro/rhel8/vmdk.go b/internal/distro/rhel8/vmdk.go index a5d37ff89..d7df4af6a 100644 --- a/internal/distro/rhel8/vmdk.go +++ b/internal/distro/rhel8/vmdk.go @@ -39,6 +39,5 @@ func vmdkCommonPackageSet(t *imageType) rpmmd.PackageSet { "dracut-config-rescue", "rng-tools", }, - }.Append(bootPackageSet(t)) - + } } diff --git a/internal/distro/rhel9/ami.go b/internal/distro/rhel9/ami.go index 2280b0e32..d1d29e3f4 100644 --- a/internal/distro/rhel9/ami.go +++ b/internal/distro/rhel9/ami.go @@ -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 diff --git a/internal/distro/rhel9/azure.go b/internal/distro/rhel9/azure.go index 213da7bc4..c3565689c 100644 --- a/internal/distro/rhel9/azure.go +++ b/internal/distro/rhel9/azure.go @@ -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{ diff --git a/internal/distro/rhel9/bare_metal.go b/internal/distro/rhel9/bare_metal.go index 62d782705..6dc8d045e 100644 --- a/internal/distro/rhel9/bare_metal.go +++ b/internal/distro/rhel9/bare_metal.go @@ -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() { diff --git a/internal/distro/rhel9/edge.go b/internal/distro/rhel9/edge.go index 36374a863..3cc72dc88 100644 --- a/internal/distro/rhel9/edge.go +++ b/internal/distro/rhel9/edge.go @@ -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)) diff --git a/internal/distro/rhel9/gce.go b/internal/distro/rhel9/gce.go index 188272fa5..056a7b01a 100644 --- a/internal/distro/rhel9/gce.go +++ b/internal/distro/rhel9/gce.go @@ -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 diff --git a/internal/distro/rhel9/package_sets.go b/internal/distro/rhel9/package_sets.go index 12ae56cfc..f3c5ca482 100644 --- a/internal/distro/rhel9/package_sets.go +++ b/internal/distro/rhel9/package_sets.go @@ -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 diff --git a/internal/distro/rhel9/qcow2.go b/internal/distro/rhel9/qcow2.go index e9e3be356..dac78fc92 100644 --- a/internal/distro/rhel9/qcow2.go +++ b/internal/distro/rhel9/qcow2.go @@ -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{ diff --git a/internal/distro/rhel9/vmdk.go b/internal/distro/rhel9/vmdk.go index eee618723..bf5f1867a 100644 --- a/internal/distro/rhel9/vmdk.go +++ b/internal/distro/rhel9/vmdk.go @@ -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{ 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 c8c5d3b70..389cb01ab 100644 --- a/test/data/manifests/centos_8-x86_64-gce-boot.json +++ b/test/data/manifests/centos_8-x86_64-gce-boot.json @@ -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, 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 b44a79626..4ccdabf0d 100644 --- a/test/data/manifests/rhel_8-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_8-x86_64-gce-boot.json @@ -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, 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 6a0f95731..430eaedf5 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,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, 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 ea5972b81..375259326 100644 --- a/test/data/manifests/rhel_84-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_84-x86_64-gce-boot.json @@ -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, 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 2f169f22e..e024476f0 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,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, 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 7a1c4c9ae..e02e3b40b 100644 --- a/test/data/manifests/rhel_85-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_85-x86_64-gce-boot.json @@ -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, 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 a410799bd..675dfbd3d 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,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, 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 265246198..cd7027e04 100644 --- a/test/data/manifests/rhel_86-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_86-x86_64-gce-boot.json @@ -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, 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 57879f40f..3f1292bdc 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,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, 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 ecd20e9f5..530d80ff5 100644 --- a/test/data/manifests/rhel_87-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_87-x86_64-gce-boot.json @@ -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, 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 8ff675b42..9de40e3cf 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,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, 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 73253305c..e75066f2e 100644 --- a/test/data/manifests/rhel_88-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_88-x86_64-gce-boot.json @@ -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, 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 8f3665e62..7f324e279 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,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, 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 49d891adb..7bc4d8f6d 100644 --- a/test/data/manifests/rhel_89-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_89-x86_64-gce-boot.json @@ -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, 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 2dda57e06..d0d8e6ab9 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,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,