Skip to content

Commit

Permalink
test/data: regenerate existing test cases (x86_64)
Browse files Browse the repository at this point in the history 
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.

(cherry picked from commit 83d87a9)
  • Loading branch information
@achilleas-k @ondrejbudai
achilleas-k authored and ondrejbudai committed Mar 16, 2021
1 parent 06813be commit 24c523f
Show file tree
Hide file tree
Showing 21 changed files with 17,731 additions and 47 deletions.
4 changes: 2 additions & 2 deletions test/data/manifests/fedora_32-x86_64-ami-boot.json
View file
Expand Up @@ -9155,12 +9155,12 @@
"version": "5.6.6-300.fc32.x86_64"
}
],
"default-target": "graphical.target",
"firewall-enabled": [
"ssh",
"mdns",
"dhcpv6-client"
],
"default-target": "graphical.target",
"fstab": [
[
"UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac",
Expand Down Expand Up @@ -9709,4 +9709,4 @@
"unbound-anchor.timer"
]
}
}
}
10,749 changes: 10,749 additions & 0 deletions test/data/manifests/fedora_32-x86_64-fedora_iot_commit_debug-boot.json
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/data/manifests/fedora_32-x86_64-openstack-boot.json
View file
Expand Up @@ -9505,12 +9505,12 @@
"version": "5.6.6-300.fc32.x86_64"
}
],
"default-target": "graphical.target",
"firewall-enabled": [
"ssh",
"mdns",
"dhcpv6-client"
],
"default-target": "graphical.target",
"fstab": [
[
"UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac",
Expand Down Expand Up @@ -10081,4 +10081,4 @@
"unbound-anchor.timer"
]
}
}
}
38 changes: 37 additions & 1 deletion test/data/manifests/fedora_32-x86_64-qcow2-boot.json
View file
Expand Up @@ -616,6 +616,9 @@
"sha256:88f4bd19a6cf6eba5e6f2b5bba80819b5ccddb0476aadc53c8df13f9c45b1e58": {
"url": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os/Packages/l/libarchive-3.4.2-1.fc32.x86_64.rpm"
},
"sha256:89c972ec7d2ab305c91c23bc248562c76f0ae645a9ed9f94d312e2f57c4d38fe": {
"url": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os/Packages/k/kernel-5.6.6-300.fc32.x86_64.rpm"
},
"sha256:8a0c00a69f9cb3a9ffacaf1cdc162c38a1faca76c9b976cb177bdc988902f2d4": {
"url": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os/Packages/p/popt-1.16-19.fc32.x86_64.rpm"
},
Expand Down Expand Up @@ -805,6 +808,9 @@
"sha256:b821e9e8bf66abacaed4a386f9ed8ffa17f4f8be3db55e1ac31d52ba2d1faa1b": {
"url": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os/Packages/c/crypto-policies-scripts-20191128-5.gitcd267a5.fc32.noarch.rpm"
},
"sha256:b98687828b1d222ea73ebb8457450913dac58dd0be2e430a93bb7e98ba816505": {
"url": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os/Packages/k/kernel-modules-5.6.6-300.fc32.x86_64.rpm"
},
"sha256:bb154a90c968150172036d86f0c9fc2a24b5799718bc4d835cb10d0758890c67": {
"url": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os/Packages/l/libnfsidmap-2.4.3-0.fc32.x86_64.rpm"
},
Expand Down Expand Up @@ -2411,10 +2417,18 @@
"checksum": "sha256:60774007011889671c28158f599032f0db253c153ccae70f5e2f5840f2dc490b",
"check_gpg": true
},
{
"checksum": "sha256:89c972ec7d2ab305c91c23bc248562c76f0ae645a9ed9f94d312e2f57c4d38fe",
"check_gpg": true
},
{
"checksum": "sha256:a1613e90865db93fb578b8ee1a4ee40bd396c6c9f2fb2a14757acacecb9f23e8",
"check_gpg": true
},
{
"checksum": "sha256:b98687828b1d222ea73ebb8457450913dac58dd0be2e430a93bb7e98ba816505",
"check_gpg": true
},
{
"checksum": "sha256:ccc3cb2dcb7a534361cc911f27ff4e869902a150b68e236cf6eb209a99d4ee22",
"check_gpg": true
Expand Down Expand Up @@ -6692,6 +6706,16 @@
"checksum": "sha256:60774007011889671c28158f599032f0db253c153ccae70f5e2f5840f2dc490b",
"check_gpg": true
},
{
"name": "kernel",
"epoch": 0,
"version": "5.6.6",
"release": "300.fc32",
"arch": "x86_64",
"remote_location": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os/Packages/k/kernel-5.6.6-300.fc32.x86_64.rpm",
"checksum": "sha256:89c972ec7d2ab305c91c23bc248562c76f0ae645a9ed9f94d312e2f57c4d38fe",
"check_gpg": true
},
{
"name": "kernel-core",
"epoch": 0,
Expand All @@ -6702,6 +6726,16 @@
"checksum": "sha256:a1613e90865db93fb578b8ee1a4ee40bd396c6c9f2fb2a14757acacecb9f23e8",
"check_gpg": true
},
{
"name": "kernel-modules",
"epoch": 0,
"version": "5.6.6",
"release": "300.fc32",
"arch": "x86_64",
"remote_location": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os/Packages/k/kernel-modules-5.6.6-300.fc32.x86_64.rpm",
"checksum": "sha256:b98687828b1d222ea73ebb8457450913dac58dd0be2e430a93bb7e98ba816505",
"check_gpg": true
},
{
"name": "keyutils-libs",
"epoch": 0,
Expand Down Expand Up @@ -9299,7 +9333,9 @@
"kbd-2.2.0-1.fc32.x86_64",
"kbd-legacy-2.2.0-1.fc32.noarch",
"kbd-misc-2.2.0-1.fc32.noarch",
"kernel-5.6.6-300.fc32.x86_64",
"kernel-core-5.6.6-300.fc32.x86_64",
"kernel-modules-5.6.6-300.fc32.x86_64",
"keyutils-libs-1.6-4.fc32.x86_64",
"kmod-27-1.fc32.x86_64",
"kmod-libs-27-1.fc32.x86_64",
Expand Down Expand Up @@ -9664,4 +9700,4 @@
"unbound-anchor.timer"
]
}
}
}
4 changes: 2 additions & 2 deletions test/data/manifests/fedora_32-x86_64-vhd-boot.json
View file
Expand Up @@ -8756,12 +8756,12 @@
"version": "5.6.6-300.fc32.x86_64"
}
],
"default-target": "graphical.target",
"firewall-enabled": [
"ssh",
"mdns",
"dhcpv6-client"
],
"default-target": "graphical.target",
"fstab": [
[
"UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac",
Expand Down Expand Up @@ -9284,4 +9284,4 @@
"waagent.service"
]
}
}
}
4 changes: 2 additions & 2 deletions test/data/manifests/fedora_32-x86_64-vmdk-boot.json
View file
Expand Up @@ -8862,12 +8862,12 @@
"version": "5.6.6-300.fc32.x86_64"
}
],
"default-target": "graphical.target",
"firewall-enabled": [
"ssh",
"mdns",
"dhcpv6-client"
],
"default-target": "graphical.target",
"fstab": [
[
"UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac",
Expand Down Expand Up @@ -9398,4 +9398,4 @@
"vmtoolsd.service"
]
}
}
}
2 changes: 1 addition & 1 deletion test/data/manifests/fedora_33-x86_64-ami-boot.json
View file
Expand Up @@ -9961,4 +9961,4 @@
],
"timezone": "UTC"
}
}
}
2 changes: 1 addition & 1 deletion test/data/manifests/fedora_33-x86_64-fedora_iot_commit_debug-boot.json
View file
Expand Up @@ -11215,4 +11215,4 @@
"timezone": "UTC",
"type": "ostree/commit"
}
}
}
2 changes: 1 addition & 1 deletion test/data/manifests/fedora_33-x86_64-openstack-boot.json
View file
Expand Up @@ -10296,4 +10296,4 @@
],
"timezone": "UTC"
}
}
}
56 changes: 55 additions & 1 deletion test/data/manifests/fedora_33-x86_64-qcow2-boot.json
View file
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -2065,6 +2074,10 @@
"checksum": "sha256:92c1615d385b32088f78a6574a2bf89a6bb29d9858abdd71471ef5113ef0831f",
"check_gpg": true
},
{
"checksum": "sha256:6bf58da366702e9e7cedf3a1560a623aec008621bfb7776665297bf073b29168",
"check_gpg": true
},
{
"checksum": "sha256:2200dd65dff57b773532153d3626ecb5914bd7826c42c689ca34be3f60ac3fe2",
"check_gpg": true
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -9848,4 +9902,4 @@
],
"timezone": "UTC"
}
}
}
2 changes: 1 addition & 1 deletion test/data/manifests/fedora_33-x86_64-vhd-boot.json
View file
Expand Up @@ -9536,4 +9536,4 @@
],
"timezone": "UTC"
}
}
}

0 comments on commit 24c523f

Please sign in to comment.