g-i edu: add new wheezy-test standalone_(gnome|xfce|lxde) tests

2 files changed, 52 insertions, 5 deletions

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 81c6597b..9ff67026 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -179,12 +179,30 @@ bootstrap_system() {
 		*_dark_theme)
 			EXTRA_APPEND="$EXTRA_APPEND theme=dark"
 			;;
+		debian-edu_*_gnome)
+			EXTRA_APPEND="$EXTRA_APPEND desktop=gnome"
+			GUITERMINAL=xterm
+			;;
+		debian-edu_*_lxde)
+			EXTRA_APPEND="$EXTRA_APPEND desktop=lxde"
+			GUITERMINAL=xterm
+			;;
+		debian-edu_*_xfce)
+			EXTRA_APPEND="$EXTRA_APPEND desktop=xfce"
+			GUITERMINAL=xterm
+			;;
 		debian-edu_*)
-			EXTRA_APPEND="$EXTRA_APPEND desktop=kde DEBCONF_DEBUG=developer"  # FIXME: this shall become more conditional...
+			EXTRA_APPEND="$EXTRA_APPEND desktop=kde"
+			GUITERMINAL=konsole
 			;;
 		*)	;;
 	esac
 	case $NAME in
+		debian-edu_*)
+			EXTRA_APPEND="$EXTRA_APPEND DEBCONF_DEBUG=developer"  # FIXME: this shall become more conditional...
+			;;
+	esac
+	case $NAME in
 	    debian-edu_*)
 		# Debian Edu and tasksel do not work the expected way
 		# with priority=critical, so do not set it.
@@ -655,7 +673,7 @@ post_install_boot() {
 					*)	;;
 				esac
 				;;
-		debian-edu*standalone)	case $TOKEN in
+		debian-edu*standalone*)	case $TOKEN in
 					# debian-edu installations report error found during installation, go forward
 					0100)	do_and_report key enter
 						;;
@@ -673,7 +691,7 @@ post_install_boot() {
 						;;
 					0400)	do_and_report key alt-f2
 						;;
-					0410)	do_and_report type "konqueror"
+					0410)	do_and_report type "iceweasel"
 						;;
 					0420)	do_and_report key space
 						;;
@@ -691,7 +709,7 @@ post_install_boot() {
 						;;
 					0600)	do_and_report key alt-f2
 						;;
-					0610)	do_and_report type konsole
+					0610)	do_and_report type $GUITERMINAL
 						;;
 					0620)	do_and_report key enter
 						;;
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 73c400a6..be865905 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -93,6 +93,18 @@
 
 - job-template:
     defaults: g-i-installation
+    name: '{name}_debian-edu_wheezy-test_standalone_gnome'
+
+- job-template:
+    defaults: g-i-installation
+    name: '{name}_debian-edu_wheezy-test_standalone_lxde'
+
+- job-template:
+    defaults: g-i-installation
+    name: '{name}_debian-edu_wheezy-test_standalone_xfce'
+
+- job-template:
+    defaults: g-i-installation
     name: '{name}_debian-edu_wheezy-test_workstation'
 
 - job-template:
@@ -488,4 +500,21 @@
          my_description: 'Just go into rescue mode, using theme=dark, via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_sid_daily_rescue_dark_theme_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 6 * * 7'
          my_recipients: 'holger@layer-acht.org'
-
+      - '{name}_debian-edu_wheezy-test_standalone_gnome':
+         my_title: 'Debian Edu (wheezy-test) standalone (gnome)'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 40 debian-edu_wheezy-test_standalone_gnome 25 http://ftp.skolelinux.org/cd-wheezy-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+         my_description: 'Do a fully automated installation of a Debian Edu Wheezy standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_timed: '42 20 * * 1,3,5,7'
+         my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
+      - '{name}_debian-edu_wheezy-test_standalone_lxde':
+         my_title: 'Debian Edu (wheezy-test) standalone (lxde)'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 41 debian-edu_wheezy-test_standalone_lxde 25 http://ftp.skolelinux.org/cd-wheezy-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+         my_description: 'Do a fully automated installation of a Debian Edu Wheezy standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_timed: '42 20 * * 1,3,5,7'
+         my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
+      - '{name}_debian-edu_wheezy-test_standalone_xfce':
+         my_title: 'Debian Edu (wheezy-test) standalone (xfce)'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 42 debian-edu_wheezy-test_standalone_xfce 25 http://ftp.skolelinux.org/cd-wheezy-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+         my_description: 'Do a fully automated installation of a Debian Edu Wheezy standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_timed: '42 20 * * 1,3,5,7'
+         my_recipients: 'jenkins+debian-edu holger@layer-acht.org'