diff --git a/templates-updates.fif.json b/templates-updates.fif.json index 70af24eb..9c1ee91c 100644 --- a/templates-updates.fif.json +++ b/templates-updates.fif.json @@ -70,6 +70,18 @@ "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": { "settings": { "DESKTOP": "kde", @@ -181,6 +193,11 @@ "arch": "x86_64", "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-*": { "arch": "x86_64", "flavor": "updates-kde-live-iso" @@ -269,6 +286,10 @@ "machine": "64bit", "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": { "machine": "64bit", "product": "fedora-updates-kde-live-iso-x86_64-*" @@ -422,6 +443,18 @@ "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": { "profiles": { "fedora-updates-kde-live-iso-x86_64-*-bios": 5, @@ -499,6 +532,7 @@ }, "profiles": { "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-workstation-live-iso-x86_64-*-64bit": 5 }, diff --git a/tests/_kiwi_build.pm b/tests/_kiwi_build.pm index c44914d1..aabcd04e 100644 --- a/tests/_kiwi_build.pm +++ b/tests/_kiwi_build.pm @@ -32,8 +32,8 @@ sub run { my $kiwiprofile = get_var("KIWI_PROFILE"); my $workarounds = get_workarounds; my $isolation = 'nspawn'; - # lives/cloud need simple isolation and permissive selinux, sadly - if (index($kiwiprofile, 'Live') != -1 || index($kiwiprofile, 'Cloud') != -1) { + # lives/cloud/disk need simple isolation and permissive selinux, sadly + if (index($kiwiprofile, 'Live') != -1 || index($kiwiprofile, 'Cloud') != -1 || index($kiwiprofile, 'Disk') != -1) { assert_script_run "setenforce Permissive"; $isolation = 'simple'; } @@ -81,6 +81,7 @@ sub run { upload_logs "image-root.log"; } my %expected_formats = ( + 'KDE-Desktop-Disk' => 'raw.xz', 'KDE-Desktop-Live' => 'iso', 'Workstation-Live' => 'iso', 'Container-Base-Generic' => 'oci.tar.xz',