test/data: regenerate existing test cases (x86_64)

A few recent changes in image type definitions haven't been reflected in the test cases yet. This also acts as a check to make sure that the changes in composer don't affect the old behaviour. Causes for (some) changes: - Kernel modules added to package lists: Prior to PR osbuild#1175 image types defined the kernel package in their package list. Some only included `kernel-core` and not the `kernel` metapackage. Now images default to having the `kernel` metapackage included which also adds `kernel-modules` and `alsa-sof-firmware`. - New package source for rt kernel.
achilleas-k · Feb 23, 2021 · db15956 · db15956
1 parent c38117b
commit db15956
Show file tree

Hide file tree

Showing 14 changed files with 6,924 additions and 33 deletions.
diff --git a/test/data/manifests/fedora_33-x86_64-ami-boot.json b/test/data/manifests/fedora_33-x86_64-ami-boot.json
@@ -9961,4 +9961,4 @@
     ],
     "timezone": "UTC"
   }
-}
+}
diff --git a/test/data/manifests/fedora_33-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_33-x86_64-fedora_iot_commit_debug-boot.json
@@ -11215,4 +11215,4 @@
     "timezone": "UTC",
     "type": "ostree/commit"
   }
-}
+}
diff --git a/test/data/manifests/fedora_33-x86_64-openstack-boot.json b/test/data/manifests/fedora_33-x86_64-openstack-boot.json
@@ -10296,4 +10296,4 @@
     ],
     "timezone": "UTC"
   }
-}
+}
diff --git a/test/data/manifests/fedora_33-x86_64-qcow2-boot.json b/test/data/manifests/fedora_33-x86_64-qcow2-boot.json
@@ -337,6 +337,9 @@
           "sha256:495ce50d147bdc637061d21a8dcb3563f3189f0055f8cd7ed87cbd8c1d3f3fac": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/x/xz-5.2.5-3.fc33.x86_64.rpm"
           },
+          "sha256:49cf91c54e6d60bbd479f237a7db40be3b50c7b143a18209ea55e3d2f4c18830": {
+            "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/k/kernel-5.8.15-301.fc33.x86_64.rpm"
+          },
           "sha256:4a1227b0a536573cbe71fede072d0bd7ac203e616cf2af1e31889aded6bb8634": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/g/gnupg2-2.2.23-1.fc33.x86_64.rpm"
           },
@@ -454,6 +457,9 @@
           "sha256:6b5c7c46f0a177bf9c8b89ae3eb251a5e7315424c326cc62871b004bcaed414d": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/w/whois-nls-5.5.7-1.fc33.noarch.rpm"
           },
+          "sha256:6bf58da366702e9e7cedf3a1560a623aec008621bfb7776665297bf073b29168": {
+            "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/a/alsa-sof-firmware-1.5-2.fc33.noarch.rpm"
+          },
           "sha256:6c235bd211f68e4ed925bc6a03b8b0e5c30f1de41cb7cd1c0c79f9996024eede": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/g/grub2-pc-modules-2.04-31.fc33.noarch.rpm"
           },
@@ -748,6 +754,9 @@
           "sha256:af2777ec0c6ee867b5ecad024de55fce1afccb5567cd48501611e073536d332f": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/s/syslinux-extlinux-nonlinux-6.04-0.16.fc33.noarch.rpm"
           },
+          "sha256:af378d963906ce5fbd91065c68319f169c078c7623b75cb6613530cb1c027b69": {
+            "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/k/kernel-modules-5.8.15-301.fc33.x86_64.rpm"
+          },
           "sha256:af6c6f788555064ff9c7d3b32b2d4edde5e33e958384a909459ce33940755971": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/f/fuse-libs-2.9.9-10.fc33.x86_64.rpm"
           },
@@ -2065,6 +2074,10 @@
                 "checksum": "sha256:92c1615d385b32088f78a6574a2bf89a6bb29d9858abdd71471ef5113ef0831f",
                 "check_gpg": true
               },
+              {
+                "checksum": "sha256:6bf58da366702e9e7cedf3a1560a623aec008621bfb7776665297bf073b29168",
+                "check_gpg": true
+              },
               {
                 "checksum": "sha256:2200dd65dff57b773532153d3626ecb5914bd7826c42c689ca34be3f60ac3fe2",
                 "check_gpg": true
@@ -2457,10 +2470,18 @@
                 "checksum": "sha256:b285c51c3bee3dfd38e2aa9f39086e27d84d5708060e71c6923b4e70ccbd6495",
                 "check_gpg": true
               },
+              {
+                "checksum": "sha256:49cf91c54e6d60bbd479f237a7db40be3b50c7b143a18209ea55e3d2f4c18830",
+                "check_gpg": true
+              },
               {
                 "checksum": "sha256:d8f263272b87175ece88f200f6b843c89c4294ee2abf630ff38485abac90fb47",
                 "check_gpg": true
               },
+              {
+                "checksum": "sha256:af378d963906ce5fbd91065c68319f169c078c7623b75cb6613530cb1c027b69",
+                "check_gpg": true
+              },
               {
                 "checksum": "sha256:e06161a9e1de438d9656e2730239426085a83e9f8ffcbe384df6f7f64254211c",
                 "check_gpg": true
@@ -5867,6 +5888,16 @@
         "checksum": "sha256:92c1615d385b32088f78a6574a2bf89a6bb29d9858abdd71471ef5113ef0831f",
         "check_gpg": true
       },
+      {
+        "name": "alsa-sof-firmware",
+        "epoch": 0,
+        "version": "1.5",
+        "release": "2.fc33",
+        "arch": "noarch",
+        "remote_location": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/a/alsa-sof-firmware-1.5-2.fc33.noarch.rpm",
+        "checksum": "sha256:6bf58da366702e9e7cedf3a1560a623aec008621bfb7776665297bf073b29168",
+        "check_gpg": true
+      },
       {
         "name": "alternatives",
         "epoch": 0,
@@ -6847,6 +6878,16 @@
         "checksum": "sha256:b285c51c3bee3dfd38e2aa9f39086e27d84d5708060e71c6923b4e70ccbd6495",
         "check_gpg": true
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "5.8.15",
+        "release": "301.fc33",
+        "arch": "x86_64",
+        "remote_location": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/k/kernel-5.8.15-301.fc33.x86_64.rpm",
+        "checksum": "sha256:49cf91c54e6d60bbd479f237a7db40be3b50c7b143a18209ea55e3d2f4c18830",
+        "check_gpg": true
+      },
       {
         "name": "kernel-core",
         "epoch": 0,
@@ -6857,6 +6898,16 @@
         "checksum": "sha256:d8f263272b87175ece88f200f6b843c89c4294ee2abf630ff38485abac90fb47",
         "check_gpg": true
       },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "5.8.15",
+        "release": "301.fc33",
+        "arch": "x86_64",
+        "remote_location": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/k/kernel-modules-5.8.15-301.fc33.x86_64.rpm",
+        "checksum": "sha256:af378d963906ce5fbd91065c68319f169c078c7623b75cb6613530cb1c027b69",
+        "check_gpg": true
+      },
       {
         "name": "keyutils-libs",
         "epoch": 0,
@@ -9372,6 +9423,7 @@
       "NetworkManager-1.26.2-2.fc33.x86_64",
       "NetworkManager-libnm-1.26.2-2.fc33.x86_64",
       "acl-2.2.53-9.fc33.x86_64",
+      "alsa-sof-firmware-1.5-2.fc33.noarch",
       "alternatives-1.14-3.fc33.x86_64",
       "audit-3.0-0.21.20191104git1c2f876.fc33.x86_64",
       "audit-libs-3.0-0.21.20191104git1c2f876.fc33.x86_64",
@@ -9471,7 +9523,9 @@
       "kbd-2.3.0-2.fc33.x86_64",
       "kbd-legacy-2.3.0-2.fc33.noarch",
       "kbd-misc-2.3.0-2.fc33.noarch",
+      "kernel-5.8.15-301.fc33.x86_64",
       "kernel-core-5.8.15-301.fc33.x86_64",
+      "kernel-modules-5.8.15-301.fc33.x86_64",
       "keyutils-libs-1.6-5.fc33.x86_64",
       "kmod-27-3.fc33.x86_64",
       "kmod-libs-27-3.fc33.x86_64",
@@ -9848,4 +9902,4 @@
     ],
     "timezone": "UTC"
   }
-}
+}
diff --git a/test/data/manifests/fedora_33-x86_64-vhd-boot.json b/test/data/manifests/fedora_33-x86_64-vhd-boot.json
@@ -9536,4 +9536,4 @@
     ],
     "timezone": "UTC"
   }
-}
+}
diff --git a/test/data/manifests/fedora_33-x86_64-vmdk-boot.json b/test/data/manifests/fedora_33-x86_64-vmdk-boot.json
@@ -337,6 +337,9 @@
           "sha256:495ce50d147bdc637061d21a8dcb3563f3189f0055f8cd7ed87cbd8c1d3f3fac": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/x/xz-5.2.5-3.fc33.x86_64.rpm"
           },
+          "sha256:49cf91c54e6d60bbd479f237a7db40be3b50c7b143a18209ea55e3d2f4c18830": {
+            "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/k/kernel-5.8.15-301.fc33.x86_64.rpm"
+          },
           "sha256:4a1227b0a536573cbe71fede072d0bd7ac203e616cf2af1e31889aded6bb8634": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/g/gnupg2-2.2.23-1.fc33.x86_64.rpm"
           },
@@ -454,6 +457,9 @@
           "sha256:6b5c7c46f0a177bf9c8b89ae3eb251a5e7315424c326cc62871b004bcaed414d": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/w/whois-nls-5.5.7-1.fc33.noarch.rpm"
           },
+          "sha256:6bf58da366702e9e7cedf3a1560a623aec008621bfb7776665297bf073b29168": {
+            "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/a/alsa-sof-firmware-1.5-2.fc33.noarch.rpm"
+          },
           "sha256:6c235bd211f68e4ed925bc6a03b8b0e5c30f1de41cb7cd1c0c79f9996024eede": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/g/grub2-pc-modules-2.04-31.fc33.noarch.rpm"
           },
@@ -748,6 +754,9 @@
           "sha256:af2777ec0c6ee867b5ecad024de55fce1afccb5567cd48501611e073536d332f": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/s/syslinux-extlinux-nonlinux-6.04-0.16.fc33.noarch.rpm"
           },
+          "sha256:af378d963906ce5fbd91065c68319f169c078c7623b75cb6613530cb1c027b69": {
+            "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/k/kernel-modules-5.8.15-301.fc33.x86_64.rpm"
+          },
           "sha256:af6c6f788555064ff9c7d3b32b2d4edde5e33e958384a909459ce33940755971": {
             "url": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/f/fuse-libs-2.9.9-10.fc33.x86_64.rpm"
           },
@@ -2065,6 +2074,10 @@
                 "checksum": "sha256:92c1615d385b32088f78a6574a2bf89a6bb29d9858abdd71471ef5113ef0831f",
                 "check_gpg": true
               },
+              {
+                "checksum": "sha256:6bf58da366702e9e7cedf3a1560a623aec008621bfb7776665297bf073b29168",
+                "check_gpg": true
+              },
               {
                 "checksum": "sha256:2200dd65dff57b773532153d3626ecb5914bd7826c42c689ca34be3f60ac3fe2",
                 "check_gpg": true
@@ -2457,10 +2470,18 @@
                 "checksum": "sha256:b285c51c3bee3dfd38e2aa9f39086e27d84d5708060e71c6923b4e70ccbd6495",
                 "check_gpg": true
               },
+              {
+                "checksum": "sha256:49cf91c54e6d60bbd479f237a7db40be3b50c7b143a18209ea55e3d2f4c18830",
+                "check_gpg": true
+              },
               {
                 "checksum": "sha256:d8f263272b87175ece88f200f6b843c89c4294ee2abf630ff38485abac90fb47",
                 "check_gpg": true
               },
+              {
+                "checksum": "sha256:af378d963906ce5fbd91065c68319f169c078c7623b75cb6613530cb1c027b69",
+                "check_gpg": true
+              },
               {
                 "checksum": "sha256:e06161a9e1de438d9656e2730239426085a83e9f8ffcbe384df6f7f64254211c",
                 "check_gpg": true
@@ -5867,6 +5888,16 @@
         "checksum": "sha256:92c1615d385b32088f78a6574a2bf89a6bb29d9858abdd71471ef5113ef0831f",
         "check_gpg": true
       },
+      {
+        "name": "alsa-sof-firmware",
+        "epoch": 0,
+        "version": "1.5",
+        "release": "2.fc33",
+        "arch": "noarch",
+        "remote_location": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/a/alsa-sof-firmware-1.5-2.fc33.noarch.rpm",
+        "checksum": "sha256:6bf58da366702e9e7cedf3a1560a623aec008621bfb7776665297bf073b29168",
+        "check_gpg": true
+      },
       {
         "name": "alternatives",
         "epoch": 0,
@@ -6847,6 +6878,16 @@
         "checksum": "sha256:b285c51c3bee3dfd38e2aa9f39086e27d84d5708060e71c6923b4e70ccbd6495",
         "check_gpg": true
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "5.8.15",
+        "release": "301.fc33",
+        "arch": "x86_64",
+        "remote_location": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/k/kernel-5.8.15-301.fc33.x86_64.rpm",
+        "checksum": "sha256:49cf91c54e6d60bbd479f237a7db40be3b50c7b143a18209ea55e3d2f4c18830",
+        "check_gpg": true
+      },
       {
         "name": "kernel-core",
         "epoch": 0,
@@ -6857,6 +6898,16 @@
         "checksum": "sha256:d8f263272b87175ece88f200f6b843c89c4294ee2abf630ff38485abac90fb47",
         "check_gpg": true
       },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "5.8.15",
+        "release": "301.fc33",
+        "arch": "x86_64",
+        "remote_location": "http://mirrors.kernel.org/fedora/releases/33/Everything/x86_64/os/Packages/k/kernel-modules-5.8.15-301.fc33.x86_64.rpm",
+        "checksum": "sha256:af378d963906ce5fbd91065c68319f169c078c7623b75cb6613530cb1c027b69",
+        "check_gpg": true
+      },
       {
         "name": "keyutils-libs",
         "epoch": 0,
@@ -9372,6 +9423,7 @@
       "NetworkManager-1.26.2-2.fc33.x86_64",
       "NetworkManager-libnm-1.26.2-2.fc33.x86_64",
       "acl-2.2.53-9.fc33.x86_64",
+      "alsa-sof-firmware-1.5-2.fc33.noarch",
       "alternatives-1.14-3.fc33.x86_64",
       "audit-3.0-0.21.20191104git1c2f876.fc33.x86_64",
       "audit-libs-3.0-0.21.20191104git1c2f876.fc33.x86_64",
@@ -9471,7 +9523,9 @@
       "kbd-2.3.0-2.fc33.x86_64",
       "kbd-legacy-2.3.0-2.fc33.noarch",
       "kbd-misc-2.3.0-2.fc33.noarch",
+      "kernel-5.8.15-301.fc33.x86_64",
       "kernel-core-5.8.15-301.fc33.x86_64",
+      "kernel-modules-5.8.15-301.fc33.x86_64",
       "keyutils-libs-1.6-5.fc33.x86_64",
       "kmod-27-3.fc33.x86_64",
       "kmod-libs-27-3.fc33.x86_64",
@@ -9848,4 +9902,4 @@
     ],
     "timezone": "UTC"
   }
-}
+}