add developer chroot-test

4 files changed, 57 insertions, 14 deletions

diff --git a/README b/README
index f85151dc..e7e9fd3a 100644
--- a/README
+++ b/README
@@ -64,7 +64,7 @@ Remember, this is still pretty much work in progress. If you can think of ways t
 ** debootstrap a wheezy chroot and install lxde
 * chroot-test_wheezy_install_xfce
 ** debootstrap a wheezy chroot and install xfce
-#FIXME: explain full_desktop here
+#FIXME: explain full_desktop and developer here
 
 === debian-installer jobs
 
diff --git a/TODO b/TODO
index a62eb618..f8385ce0 100644
--- a/TODO
+++ b/TODO
@@ -71,10 +71,6 @@ As documented in manual/doc/translations_po.txt:
 * inform debian-devel@
 
 ----
-<h01ger> for "bloated" squeeze-wheezy (or whatever) upgrade tests: debootstrap + apt-get install openoffice.org gnome kde-plasma-desktop xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts mplayer wine virtualbox texlive-full asciidoc
-<h01ger> anything else for that list?
-<algernon> build deps for all of those?
-<h01ger> i'll try that, thanks
 <pabs> h01ger: how about all of the blends?
 <h01ger> pabs, if you could give me concrete (meta-)package names to install, that would be great+very helpful
 <h01ger> for ^education* and ^debian-edu* i can find them myself
diff --git a/bin/chroot_tester.sh b/bin/chroot_tester.sh
index 830238c7..a4ddef8f 100755
--- a/bin/chroot_tester.sh
+++ b/bin/chroot_tester.sh
@@ -76,6 +76,13 @@ apt-get -y install $@
 EOF
 }
 
+prepare_install_build_depends() {
+	cat >> $CTMPFILE <<-EOF
+$SCRIPT_HEADER
+apt-get -y build-dep $@
+EOF
+}
+
 prepare_upgrade2() {
 	cat >> $CTMPFILE <<-EOF
 echo "deb $MIRROR $1 main contrib non-free" > /etc/apt/sources.list
@@ -102,6 +109,13 @@ install_packages() {
 	execute_ctmpfile 
 }
 
+install_build_depends() {
+	echo "Installing build depends for $1 now."
+	shift
+	prepare_install_build_depends $@
+	execute_ctmpfile
+}
+
 upgrade2() {
 	echo "Upgrading to $1 now."
 	prepare_upgrade2 $1
@@ -123,15 +137,24 @@ case $1 in
 	*)	echo "unsupported distro." ; exit 1 ;;
 esac
 bootstrap $DISTRO
+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 vim emacs"
 
 if [ "$2" != "" ] ; then
 	case $2 in
-		none)	;;
-		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 ;;
+		none)		;;
+		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 $FULL_DESKTOP
+				;;
+		developer)	install_packages developer $FULL_DESKTOP
+				install_build_depends developer $FULL_DESKTOP
+				;;
 		*)	echo "unsupported component." ; exit 1 ;;
 	esac
 fi
diff --git a/job-cfg/chroot-tests.yaml b/job-cfg/chroot-tests.yaml
index 4b477ddb..e2d1a429 100644
--- a/job-cfg/chroot-tests.yaml
+++ b/job-cfg/chroot-tests.yaml
@@ -103,6 +103,10 @@
     name: '{name}_sid_install_full_desktop'
 
 - job-template:
+    defaults: chroot-tests
+    name: '{name}_sid_install_developer'
+
+- job-template:
     defaults: chroot-tests+trigger
     name: '{name}_sid_bootstrap'
 
@@ -127,6 +131,10 @@
     name: '{name}_squeeze_install_full_desktop_upgrade_to_wheezy'
 
 - job-template:
+    defaults: chroot-tests
+    name: '{name}_squeeze_install_developer_upgrade_to_wheezy'
+
+- job-template:
     defaults: chroot-tests+trigger
     name: '{name}_squeeze_bootstrap_upgrade_to_wheezy'
 
@@ -151,6 +159,10 @@
     name: '{name}_wheezy_install_full_desktop'
 
 - job-template:
+    defaults: chroot-tests
+    name: '{name}_wheezy_install_developer'
+
+- job-template:
     defaults: chroot-tests+trigger
     name: '{name}_wheezy_bootstrap'
 
@@ -179,10 +191,14 @@
          chroot_tester_params: 'sid full_desktop'
          my_description: 'Debootstrap sid, then install four desktop environments and the most commonly used applications and packages.'
 
+      - '{name}_sid_install_developer':
+         chroot_tester_params: 'sid developer'
+         my_description: 'Debootstrap sid, then install four desktop environments and the most commonly used applications and packages - and the build depends for all of these.'
+
       - '{name}_sid_bootstrap':
          chroot_tester_params: 'sid'
          my_description: 'Debootstrap sid.'
-         my_trigger: 'chroot-test_sid_install_gnome, chroot-test_sid_install_kde, chroot-test_sid_install_lxde, chroot-test_sid_install_xfce, chroot-test_sid_install_full_desktop'
+         my_trigger: 'chroot-test_sid_install_gnome, chroot-test_sid_install_kde, chroot-test_sid_install_lxde, chroot-test_sid_install_xfce, chroot-test_sid_install_full_desktop, chroot-test_sid_install_developer'
 
       - '{name}_squeeze_install_gnome_upgrade_to_wheezy':
          chroot_tester_params: 'squeeze gnome wheezy'
@@ -204,10 +220,14 @@
          chroot_tester_params: 'sid full_desktop wheezy'
          my_description: 'Debootstrap squeeze, then install four desktop environments and the most commonly used applications and packages, then upgrade to wheezy.'
 
+      - '{name}_squeeze_install_developer_upgrade_to_wheezy':
+         chroot_tester_params: 'sid developer wheezy'
+         my_description: 'Debootstrap squeeze, then install four desktop environments and the most commonly used applications and packages - and the build depends for all of these, then upgrade to wheezy.'
+
       - '{name}_squeeze_bootstrap_upgrade_to_wheezy':
          chroot_tester_params: 'squeeze none wheezy'
          my_description: 'Debootstrap squeeze, then upgrade to wheezy.'
-         my_trigger: 'chroot-test_squeeze_install_gnome_upgrade_to_wheezy, chroot-test_squeeze_install_kde_upgrade_to_wheezy, chroot-test_squeeze_install_lxde_upgrade_to_wheezy, chroot-test_squeeze_install_xfce_upgrade_to_wheezy, chroot-test_squeeze_install_full_desktop_upgrade_to_wheezy'
+         my_trigger: 'chroot-test_squeeze_install_gnome_upgrade_to_wheezy, chroot-test_squeeze_install_kde_upgrade_to_wheezy, chroot-test_squeeze_install_lxde_upgrade_to_wheezy, chroot-test_squeeze_install_xfce_upgrade_to_wheezy, chroot-test_squeeze_install_full_desktop_upgrade_to_wheezy, chroot-test_squeeze_install_developer_upgrade_to_wheezy,'
 
       - '{name}_wheezy_install_gnome':
          chroot_tester_params: 'wheezy gnome'
@@ -229,10 +249,14 @@
          chroot_tester_params: 'wheezy full_desktop'
          my_description: 'Debootstrap wheezy, then install four desktop environments and the most commonly used applications and packages.'
 
+      - '{name}_wheezy_install_developer':
+         chroot_tester_params: 'wheezy developer'
+         my_description: 'Debootstrap wheezy, then install four desktop environments and the most commonly used applications and packages - and the build depends for all of these.'
+
       - '{name}_wheezy_bootstrap':
          chroot_tester_params: 'wheezy'
          my_description: 'Debootstrap wheezy.'
-         my_trigger: 'chroot-test_wheezy_install_gnome, chroot-test_wheezy_install_kde, chroot-test_wheezy_install_lxde, chroot-test_wheezy_install_xfce, chroot-test_wheezy_install_full_desktop'
+         my_trigger: 'chroot-test_wheezy_install_gnome, chroot-test_wheezy_install_kde, chroot-test_wheezy_install_lxde, chroot-test_wheezy_install_xfce, chroot-test_wheezy_install_full_desktop, chroot-test_wheezy_install_developer'
 
       - '{name}_housekeeping':
          my_description: 'Cleanup so that there is a predictable environment.'