chroot-installation: add tests for full kde desktop, thanks to Pino Toscano for the idea

3 files changed, 36 insertions, 10 deletions

diff --git a/README b/README
index d17dd873..a4881347 100644
--- a/README
+++ b/README
@@ -95,7 +95,7 @@ Installation tests inside chroot environments.
 
 * $distro-install jobs (and $distro-install+upgrade jobs):
 ** `debootstrap $distro`, install a *$set_of_packages* (and upgrade to *$2nd_distro*)
-** these $set_of_packages exist: 'gnome', 'kde', 'lxde', 'xfc', 'full_desktop' (all four desktops plus `vlc evince iceweasel chromium cups build-essential devscripts mplayer wine texlive-full asciidoc vim emacs`) and 'develop'
+** these $set_of_packages exist: 'gnome', 'kde', 'kde-full', 'lxde', 'xfc', 'full_desktop' (all five desktops plus `vlc evince iceweasel chromium cups build-essential devscripts mplayer wine texlive-full asciidoc vim emacs`) and 'develop'
 *** install is done with `apt-get install`, except for 'develop' where `apt-get build-dep` is used to install the build dependencies of these packages.
 
 === webcheck jobs
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index fe284efe..f8d10c3f 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012 Holger Levsen <holger@layer-acht.org>
+# Copyright 2012,2013 Holger Levsen <holger@layer-acht.org>
 # released under the GPLv=2
 
 # $1 = base distro
@@ -140,7 +140,7 @@ case $1 in
 			;;
 esac
 bootstrap $DISTRO
-FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts mplayer wine texlive-full asciidoc vim emacs"
+FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts mplayer wine texlive-full asciidoc vim emacs"
 
 if [ "$2" != "" ] ; then
 	case $2 in
@@ -149,6 +149,8 @@ if [ "$2" != "" ] ; then
 				;;
 		kde)		install_packages kde kde-plasma-desktop desktop-base
 				;;
+		kde-full)	install_packages kde kde-full kde-standard desktop-base
+				;;
 		xfce)		install_packages xfce xfce4 desktop-base
 				;;
 		lxde)		install_packages lxde lxde desktop-base
diff --git a/job-cfg/chroot-installation.yaml b/job-cfg/chroot-installation.yaml
index c66a0f59..e376ba7c 100644
--- a/job-cfg/chroot-installation.yaml
+++ b/job-cfg/chroot-installation.yaml
@@ -92,6 +92,10 @@
 
 - job-template:
     defaults: chroot-installation
+    name: '{name}_sid_install_kde-full'
+
+- job-template:
+    defaults: chroot-installation
     name: '{name}_sid_install_lxde'
 
 - job-template:
@@ -120,6 +124,10 @@
 
 - job-template:
     defaults: chroot-installation
+    name: '{name}_squeeze_install_kde-full_upgrade_to_wheezy'
+
+- job-template:
+    defaults: chroot-installation
     name: '{name}_squeeze_install_lxde_upgrade_to_wheezy'
 
 - job-template:
@@ -148,6 +156,10 @@
 
 - job-template:
     defaults: chroot-installation
+    name: '{name}_wheezy_install_kde-full'
+
+- job-template:
+    defaults: chroot-installation
     name: '{name}_wheezy_install_lxde'
 
 - job-template:
@@ -176,7 +188,11 @@
 
       - '{name}_sid_install_kde':
          installation_params: 'sid kde'
-         my_description: 'Debootstrap sid, then install KDE.'
+         my_description: 'Debootstrap sid, then install KDE plasma desktop.'
+
+      - '{name}_sid_install_kde-full':
+         installation_params: 'sid kde-full'
+         my_description: 'Debootstrap sid, then install complete KDE desktop.'
 
       - '{name}_sid_install_lxde':
          installation_params: 'sid lxde'
@@ -197,15 +213,19 @@
       - '{name}_sid_bootstrap':
          installation_params: 'sid'
          my_description: 'Debootstrap sid.'
-         my_trigger: 'chroot-installation_sid_install_gnome, chroot-installation_sid_install_kde, chroot-installation_sid_install_lxde, chroot-installation_sid_install_xfce, chroot-installation_sid_install_full_desktop, chroot-installation_sid_install_developer'
+         my_trigger: 'chroot-installation_sid_install_gnome, chroot-installation_sid_install_kde, chroot-installation_sid_install_kde-full, chroot-installation_sid_install_lxde, chroot-installation_sid_install_xfce, chroot-installation_sid_install_full_desktop, chroot-installation_sid_install_developer'
 
       - '{name}_squeeze_install_gnome_upgrade_to_wheezy':
          installation_params: 'squeeze gnome wheezy'
-         my_description: 'Debootstrap squeeze, install GNOME then upgrade to wheezy.'
+         my_description: 'Debootstrap squeeze, install GNOME, then upgrade to wheezy.'
 
       - '{name}_squeeze_install_kde_upgrade_to_wheezy':
          installation_params: 'squeeze kde wheezy'
-         my_description: 'Debootstrap squeeze, install KDE then upgrade to wheezy.'
+         my_description: 'Debootstrap squeeze, install KDE plasma desktop, then upgrade to wheezy.'
+
+      - '{name}_squeeze_install_kde-full_upgrade_to_wheezy':
+         installation_params: 'squeeze kde-full wheezy'
+         my_description: 'Debootstrap squeeze, install complete KDE desktop, then upgrade to wheezy.'
 
       - '{name}_squeeze_install_lxde_upgrade_to_wheezy':
          installation_params: 'squeeze lxde wheezy'
@@ -226,7 +246,7 @@
       - '{name}_squeeze_bootstrap_upgrade_to_wheezy':
          installation_params: 'squeeze none wheezy'
          my_description: 'Debootstrap squeeze, then upgrade to wheezy.'
-         my_trigger: 'chroot-installation_squeeze_install_gnome_upgrade_to_wheezy, chroot-installation_squeeze_install_kde_upgrade_to_wheezy, chroot-installation_squeeze_install_lxde_upgrade_to_wheezy, chroot-installation_squeeze_install_xfce_upgrade_to_wheezy, chroot-installation_squeeze_install_full_desktop_upgrade_to_wheezy, chroot-installation_squeeze_install_developer_upgrade_to_wheezy'
+         my_trigger: 'chroot-installation_squeeze_install_gnome_upgrade_to_wheezy, chroot-installation_squeeze_install_kde_upgrade_to_wheezy, chroot-installation_squeeze_install_kde-full_upgrade_to_wheezy, chroot-installation_squeeze_install_lxde_upgrade_to_wheezy, chroot-installation_squeeze_install_xfce_upgrade_to_wheezy, chroot-installation_squeeze_install_full_desktop_upgrade_to_wheezy, chroot-installation_squeeze_install_developer_upgrade_to_wheezy'
 
       - '{name}_wheezy_install_gnome':
          installation_params: 'wheezy gnome'
@@ -234,7 +254,11 @@
 
       - '{name}_wheezy_install_kde':
          installation_params: 'wheezy kde'
-         my_description: 'Debootstrap wheezy, then install KDE.'
+         my_description: 'Debootstrap wheezy, then install KDE plasma desktop.'
+
+      - '{name}_wheezy_install_kde-full':
+         installation_params: 'wheezy kde-full'
+         my_description: 'Debootstrap wheezy, then install complete KDE desktop.'
 
       - '{name}_wheezy_install_xfce':
          installation_params: 'wheezy xfce'
@@ -255,7 +279,7 @@
       - '{name}_wheezy_bootstrap':
          installation_params: 'wheezy'
          my_description: 'Debootstrap wheezy.'
-         my_trigger: 'chroot-installation_wheezy_install_gnome, chroot-installation_wheezy_install_kde, chroot-installation_wheezy_install_lxde, chroot-installation_wheezy_install_xfce, chroot-installation_wheezy_install_full_desktop, chroot-installation_wheezy_install_developer'
+         my_trigger: 'chroot-installation_wheezy_install_gnome, chroot-installation_wheezy_install_kde, chroot-installation_wheezy_install_kde-full, chroot-installation_wheezy_install_lxde, chroot-installation_wheezy_install_xfce, chroot-installation_wheezy_install_full_desktop, chroot-installation_wheezy_install_developer'
 
       - '{name}_housekeeping':
          my_description: 'Cleanup and monitor so that there is a predictable environment.'