srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-12-08 18:05:59 +00:00
Code Issues Releases Activity

Enable a KDE disk image build+boot test for updates on aarch64

Browse Source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-10-30 15:47:31 -07:00
parent f1b2dfe536
commit 08c298e87d
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
templates-updates.fif.json
View File

@ -70,6 +70,18 @@
"SUBVARIANT": "Workstation" "SUBVARIANT": "Workstation"
} }
}, },
"updates-kde-disk": {
"settings": {
"DESKTOP": "kde",
"HDDSIZEGB": "15",
"KIWI_PROFILE": "KDE-Desktop-Disk",
"LIVE": "1",
"NUMDISKS": "2",
"PACKAGE_SET": "default",
"RETRY": "1",
"SUBVARIANT": "KDE"
}
},
"updates-kde-live-iso": { "updates-kde-live-iso": {
"settings": { "settings": {
"DESKTOP": "kde", "DESKTOP": "kde",
@ -181,6 +193,11 @@
"arch": "x86_64", "arch": "x86_64",
"flavor": "updates-workstation-live-iso" "flavor": "updates-workstation-live-iso"
}, },
"fedora-updates-kde-disk-aarch64-*": {
"arch": "aarch64",
"flavor": "updates-kde-disk",
"group_name": "Fedora AArch64 Updates"
},
"fedora-updates-kde-live-iso-x86_64-*": { "fedora-updates-kde-live-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"flavor": "updates-kde-live-iso" "flavor": "updates-kde-live-iso"
@ -269,6 +286,10 @@
"machine": "64bit", "machine": "64bit",
"product": "fedora-updates-server-x86_64-*" "product": "fedora-updates-server-x86_64-*"
}, },
"fedora-updates-kde-disk-aarch64-*-aarch64": {
"machine": "aarch64",
"product": "fedora-updates-kde-disk-aarch64-*"
},
"fedora-updates-kde-live-iso-x86_64-*-64bit": { "fedora-updates-kde-live-iso-x86_64-*-64bit": {
"machine": "64bit", "machine": "64bit",
"product": "fedora-updates-kde-live-iso-x86_64-*" "product": "fedora-updates-kde-live-iso-x86_64-*"
@ -422,6 +443,18 @@
"updates-desktops": 5 "updates-desktops": 5
} }
}, },
"install_arm_image_deployment": {
"profiles": {
"fedora-updates-kde-disk-aarch64-*-aarch64": 5
},
"settings": {
"+START_AFTER_TEST": "kiwi_build@%ARCH_BASE_MACHINE%",
"HDD_1": "Fedora.%ARCH%-%VERSION%.raw.xz",
"IMAGE_DEPLOY": "1",
"INSTALL_NO_USER": "1",
"NUMDISKS": "2"
}
},
"install_default_update_live": { "install_default_update_live": {
"profiles": { "profiles": {
"fedora-updates-kde-live-iso-x86_64-*-bios": 5, "fedora-updates-kde-live-iso-x86_64-*-bios": 5,
@ -499,6 +532,7 @@
}, },
"profiles": { "profiles": {
"fedora-updates-container-x86_64-*-64bit": 5, "fedora-updates-container-x86_64-*-64bit": 5,
"fedora-updates-kde-disk-aarch64-*-aarch64": 5,
"fedora-updates-kde-live-iso-x86_64-*-64bit": 5, "fedora-updates-kde-live-iso-x86_64-*-64bit": 5,
"fedora-updates-workstation-live-iso-x86_64-*-64bit": 5 "fedora-updates-workstation-live-iso-x86_64-*-64bit": 5
}, },

5
tests/_kiwi_build.pm
View File

@ -32,8 +32,8 @@ sub run {
my $kiwiprofile = get_var("KIWI_PROFILE"); my $kiwiprofile = get_var("KIWI_PROFILE");
my $workarounds = get_workarounds; my $workarounds = get_workarounds;
my $isolation = 'nspawn'; my $isolation = 'nspawn';
# lives/cloud need simple isolation and permissive selinux, sadly # lives/cloud/disk need simple isolation and permissive selinux, sadly
if (index($kiwiprofile, 'Live') != -1 || index($kiwiprofile, 'Cloud') != -1) { if (index($kiwiprofile, 'Live') != -1 || index($kiwiprofile, 'Cloud') != -1 || index($kiwiprofile, 'Disk') != -1) {
assert_script_run "setenforce Permissive"; assert_script_run "setenforce Permissive";
$isolation = 'simple'; $isolation = 'simple';
} }
@ -81,6 +81,7 @@ sub run {
upload_logs "image-root.log"; upload_logs "image-root.log";
} }
my %expected_formats = ( my %expected_formats = (
'KDE-Desktop-Disk' => 'raw.xz',
'KDE-Desktop-Live' => 'iso', 'KDE-Desktop-Live' => 'iso',
'Workstation-Live' => 'iso', 'Workstation-Live' => 'iso',
'Container-Base-Generic' => 'oci.tar.xz', 'Container-Base-Generic' => 'oci.tar.xz',