From b113cf0f8a601196256851fb7b46c58d28127a84 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Tue, 27 Jul 2021 01:02:45 +0200
Subject: [PATCH] test/data: update x86-64 manifests

Signed-off-by: Achilleas Koutsou <achilleas@koutsou.net>
---
 .../manifests/rhel_85-x86_64-ami-boot.json    | 36 ++++++++++++++++-
 .../rhel_85-x86_64-edge_container-boot.json   | 20 ++++++++++
 .../rhel_85-x86_64-openstack-boot.json        | 36 ++++++++++++++++-
 .../manifests/rhel_85-x86_64-qcow2-boot.json  | 36 ++++++++++++++++-
 .../manifests/rhel_85-x86_64-tar-boot.json    | 40 +++++++++++++++++++
 .../manifests/rhel_85-x86_64-vhd-boot.json    | 36 ++++++++++++++++-
 .../manifests/rhel_85-x86_64-vmdk-boot.json   | 36 ++++++++++++++++-
 7 files changed, 230 insertions(+), 10 deletions(-)

diff --git a/test/data/manifests/rhel_85-x86_64-ami-boot.json b/test/data/manifests/rhel_85-x86_64-ami-boot.json
index f9c3ec8d6..282efba2b 100644
--- a/test/data/manifests/rhel_85-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-ami-boot.json
@@ -444,6 +444,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1001,7 +1004,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7389,6 +7393,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10196,7 +10227,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [
diff --git a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
index 241bc7ee1..738a8c33a 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
@@ -467,7 +467,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
                   "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:761ff1ccc95562a4512c4bea1d4c2b507c42e3805c9e1e0093c80539a954047b",
                   "sha256:4da971c6e5a8a759c919dc9cde21324ee2b309c96b46eb000b4f251a287b08b1",
                   "sha256:482e8619051fd7c027e06c206a016fa53c9b7d49afdc725fd38ff0375ab89318",
@@ -9300,6 +9302,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
       {
         "name": "kernel-core",
         "epoch": 0,
@@ -9309,6 +9320,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
         "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
       },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "keyutils",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_85-x86_64-openstack-boot.json b/test/data/manifests/rhel_85-x86_64-openstack-boot.json
index 891ab077f..04a6c680f 100644
--- a/test/data/manifests/rhel_85-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-openstack-boot.json
@@ -475,6 +475,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1047,7 +1050,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7669,6 +7673,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10575,7 +10606,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
index 3f58b6b6f..f336ddefe 100644
--- a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
@@ -467,6 +467,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1061,7 +1064,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7623,6 +7627,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10556,7 +10587,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [
diff --git a/test/data/manifests/rhel_85-x86_64-tar-boot.json b/test/data/manifests/rhel_85-x86_64-tar-boot.json
index df64db900..623f6b199 100644
--- a/test/data/manifests/rhel_85-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-tar-boot.json
@@ -408,6 +408,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:4da971c6e5a8a759c919dc9cde21324ee2b309c96b46eb000b4f251a287b08b1",
                   "sha256:482e8619051fd7c027e06c206a016fa53c9b7d49afdc725fd38ff0375ab89318",
                   "sha256:fe6e67b493e34011931b7ce875280d10e27ad8326eec129f5dd935d54b3591bd",
@@ -461,6 +464,7 @@
                   "sha256:0d612ef49922f8eff2d2c96e8da290f77dacf7b667f6b8a9be751bd6394fcf73",
                   "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048",
                   "sha256:45cc50a8b02f9bbbbe2c8c056f34622d15d383f695916ac07821d688fcab1c25",
+                  "sha256:c6a28277626ee9340db506f0355f7df79a88208a2d5694d972f6a08d1f3a6fbe",
                   "sha256:60c5b5ece7a84f1c5e320b6120b64c176ce4bc48b484b85e20a13cb52ee7db05",
                   "sha256:5d8dc82442f6a87b0878c74c61638c012bf50a23df151a65529b0ae75e6aff82",
                   "sha256:55a58ea1e63e2cc102d82ab4d02e04e90e2c03819b2a2dee74395905868eb5fd",
@@ -5947,6 +5951,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "keyutils-libs",
         "epoch": 0,
@@ -6424,6 +6455,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/libzstd-1.4.4-1.el8.x86_64.rpm",
         "checksum": "sha256:45cc50a8b02f9bbbbe2c8c056f34622d15d383f695916ac07821d688fcab1c25"
       },
+      {
+        "name": "linux-firmware",
+        "epoch": 0,
+        "version": "20201218",
+        "release": "102.git05789708.el8",
+        "arch": "noarch",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/linux-firmware-20201218-102.git05789708.el8.noarch.rpm",
+        "checksum": "sha256:c6a28277626ee9340db506f0355f7df79a88208a2d5694d972f6a08d1f3a6fbe"
+      },
       {
         "name": "lua-libs",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_85-x86_64-vhd-boot.json b/test/data/manifests/rhel_85-x86_64-vhd-boot.json
index 85c4dbddf..41fd435ff 100644
--- a/test/data/manifests/rhel_85-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-vhd-boot.json
@@ -478,6 +478,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1058,7 +1061,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7736,6 +7740,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10624,7 +10655,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [
diff --git a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json b/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
index 245b026a5..2c6ab1a3d 100644
--- a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
@@ -479,6 +479,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1029,7 +1032,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7668,6 +7672,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10294,7 +10325,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [