diff options
| author |  Neal Gompa <ngompa@fedoraproject.org>
| 2024-07-22 17:16:38 -0400 |
|---|---|---|
| committer | Neal Gompa <ngompa@fedoraproject.org>
| 2024-07-24 07:13:41 -0400 |
| commit | 3af429672cad48dda21ad4444dc62db7de7083a5 (patch) | |
| tree | 7b2aa6578862b312fc1124b1b4e183c0682aa7a4 | |
| parent | c8229ee61ff0e91361e41ad4a11277bb4f3078ee (diff) | |
| download | kiwi-descriptions-3af429672cad48dda21ad4444dc62db7de7083a5.tar.gz kiwi-descriptions-3af429672cad48dda21ad4444dc62db7de7083a5.zip | |
teams/kde: Rework to add disk image build
This adds a disk image build profile to produce Fedora KDE images.
Additionally, these profiles are now tested in CI.
| -rw-r--r-- | VARIANTS.md | 3 | ||||
| -rw-r--r-- | components/desktops/kde.xml | 1 | ||||
| -rw-r--r-- | teams/kde.xml | 11 | ||||
| -rw-r--r-- | tmt/plans/desktop/kde/build-desktop-disk.fmf | 8 | ||||
| -rw-r--r-- | tmt/plans/desktop/kde/build-desktop-live.fmf | 8 |
5 files changed, 27 insertions, 4 deletions
diff --git a/VARIANTS.md b/VARIANTS.md index 2cf470b..c1ae75b 100644 --- a/VARIANTS.md +++ b/VARIANTS.md @@ -12,5 +12,6 @@ | | | `Container-Base-Generic-Minimal` | | | | `Container-Base-Generic` | | Toolbox Container | `oci` | `Container-Toolbox` | -| KDE Spin | `iso` | `KDE-Live` | +| KDE Spin | `iso` | `KDE-Desktop-Live` | +| | `oem` | `KDE-Desktop-Disk` | | Workstation Edition | `iso` | `Workstation-Live` | diff --git a/components/desktops/kde.xml b/components/desktops/kde.xml index fb4a158..fa45844 100644 --- a/components/desktops/kde.xml +++ b/components/desktops/kde.xml @@ -17,7 +17,6 @@ <package name="libreoffice-math"/> <package name="fuse"/> <package name="kde-l10n"/> - <package name="plasma-welcome-fedora"/> <ignore name="@admin-tools"/> <ignore name="gnome-disk-utility"/> <ignore name="system-config-printer"/> diff --git a/teams/kde.xml b/teams/kde.xml index 77749d1..9ef8878 100644 --- a/teams/kde.xml +++ b/teams/kde.xml @@ -1,11 +1,18 @@ <image> <profiles> - <profile name="KDE-Live" description="KDE Plasma Spin Live DVD"> + <profile name="KDE-Desktop-Live" description="KDE Plasma Desktop Spin Live DVD"> <requires profile="KDE-Desktop"/> <requires profile="LiveInstall"/> </profile> + <profile name="KDE-Desktop-Disk" description="KDE Plasma Desktop Spin Install Disk"> + <requires profile="BootDiskCore"/> + <requires profile="KDE-Desktop"/> + </profile> </profiles> - <packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Live"> + <packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Desktop-Disk,KDE-Desktop-Live"> <package name="fedora-release-kde"/> </packages> + <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop-Disk,KDE-Desktop-Live"> + <package name="plasma-welcome-fedora"/> + </packages> </image> diff --git a/tmt/plans/desktop/kde/build-desktop-disk.fmf b/tmt/plans/desktop/kde/build-desktop-disk.fmf new file mode 100644 index 0000000..fa3837e --- /dev/null +++ b/tmt/plans/desktop/kde/build-desktop-disk.fmf @@ -0,0 +1,8 @@ +summary: Build KDE Desktop disk image +discover: + how: fmf +environment: + image_type: oem + image_profile: KDE-Desktop-Disk +execute: + how: tmt diff --git a/tmt/plans/desktop/kde/build-desktop-live.fmf b/tmt/plans/desktop/kde/build-desktop-live.fmf new file mode 100644 index 0000000..bdde89d --- /dev/null +++ b/tmt/plans/desktop/kde/build-desktop-live.fmf @@ -0,0 +1,8 @@ +summary: Build KDE Desktop live image +discover: + how: fmf +environment: + image_type: iso + image_profile: KDE-Desktop-Live +execute: + how: tmt |