From 592956367f10bd11ba78ddd05d30a406f9d37ef4 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 30 Nov 2012 16:14:03 +0100
Subject: new chroot jobs for testing a full blown desktop

---
 bin/chroot_tester.sh | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'bin/chroot_tester.sh')

diff --git a/bin/chroot_tester.sh b/bin/chroot_tester.sh
index 45f69672..830238c7 100755
--- a/bin/chroot_tester.sh
+++ b/bin/chroot_tester.sh
@@ -100,8 +100,6 @@ install_packages() {
 	shift
 	prepare_install_packages $@
 	execute_ctmpfile 
-	prepare_install_packages desktop-base
-	execute_ctmpfile
 }
 
 upgrade2() {
@@ -113,19 +111,27 @@ upgrade2() {
 trap cleanup_all INT TERM EXIT
 
 case $1 in
-	squeeze)bootstrap squeeze;;
-	wheezy)	bootstrap wheezy;;
-	sid)	bootstrap sid;;
+	squeeze)	DISTRO="squeeze"
+			OFFICE="openoffice.org"
+			;;
+	wheezy)		DISTRO="wheezy"
+			OFFICE="libreoffice"
+			;;
+	sid)		DISTRO="sid"
+			OFFICE="libreoffice"
+			;;
 	*)	echo "unsupported distro." ; exit 1 ;;
 esac
+bootstrap $DISTRO
 
 if [ "$2" != "" ] ; then
 	case $2 in
 		none)	;;
-		gnome)	install_packages gnome gnome ;;
-		kde)	install_packages kde kde-plasma-desktop ;;
-		xfce)	install_packages xfce xfce4 ;;
-		lxde)	install_packages lxde lxde ;;
+		gnome)	install_packages gnome gnome desktop-base ;;
+		kde)	install_packages kde kde-plasma-desktop desktop-base ;;
+		xfce)	install_packages xfce xfce4 desktop-base;;
+		lxde)	install_packages lxde lxde desktop-base ;;
+		full_desktop)	install_packages full_desktop $OFFICE desktop-base gnome kde-plasma-desktop xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts mplayer wine virtualbox texlive-full asciidoc ;;
 		*)	echo "unsupported component." ; exit 1 ;;
 	esac
 fi
-- 
cgit v1.2.3-70-g09d2