From 46ee22f70fa78bc1ee700a9a95c6350449e80188 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 10 Dec 2019 14:12:11 -0800
Subject: [PATCH] Add more stuff to KDE image, build it for more releases

This is related to enabling update tests for KDE. While testing
that it transpired that the KDE disk image is missing various
stuff that is on the live image and systems installed from the
live image; this is because the kde-desktop-environment env
group doesn't by default include several groups and individual
packages that the live kickstart *does* include. So our current
disk image closely matches what you get if you do a network
install and pick the KDE env group and don't pick any option
groups, but that's not a very common thing to do, and it causes
problems for the tests (e.g. okular and firefox not being
there). I think it's reasonable to make the image resemble a
live install more closely; this is more convenient but I think
it's *also* more useful, as there are probably far more KDE
installs out there *with* these things than without them. More
KDE installs are probably done with the live than via network
install, and even KDE installs done via netinst may well have
these bits added subsequently.

Obviously, we bump the image version with this change, so we'll
need to update the scheduler and templates also.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 hdds.json |  6 +++---
 kde.ks    | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/hdds.json b/hdds.json
index 27bb73c..319742b 100644
--- a/hdds.json
+++ b/hdds.json
@@ -178,11 +178,11 @@
         {
             "name" : "kde",
             "releases" : {
-                "-1" : ["x86_64"],
-                "-2" : ["x86_64"]
+                "stable" : ["x86_64"],
+                "branched" : ["x86_64"]
             },
             "size" : "20",
-            "imgver": "3"
+            "imgver": "4"
         },
         {
             "name" : "support",
diff --git a/kde.ks b/kde.ks
index 62c10df..bc900d5 100644
--- a/kde.ks
+++ b/kde.ks
@@ -14,6 +14,16 @@ poweroff
 
 %packages
 @^kde-desktop-environment
+# these are all in the KDE live image, we want to match that as it's
+# the most common KDE deployment method
+@firefox
+@kde-apps
+@kde-media
+@kde-office
+@networkmanager-submodules
+fedora-release-kde
+falkon
+
 imsettings-qt
 -initial-setup
 -initial-setup-gui