let full_desktop trigger developer

2 files changed, 15 insertions, 8 deletions

diff --git a/bin/chroot_tester.sh b/bin/chroot_tester.sh
index a4ddef8f..cd367ec5 100755
--- a/bin/chroot_tester.sh
+++ b/bin/chroot_tester.sh
@@ -134,7 +134,9 @@ case $1 in
 	sid)		DISTRO="sid"
 			OFFICE="libreoffice"
 			;;
-	*)	echo "unsupported distro." ; exit 1 ;;
+	*)		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"
@@ -155,7 +157,9 @@ if [ "$2" != "" ] ; then
 		developer)	install_packages developer $FULL_DESKTOP
 				install_build_depends developer $FULL_DESKTOP
 				;;
-		*)	echo "unsupported component." ; exit 1 ;;
+		*)		echo "unsupported component."
+				exit 1
+				;;
 	esac
 fi
 
diff --git a/job-cfg/chroot-tests.yaml b/job-cfg/chroot-tests.yaml
index e2d1a429..42c5f645 100644
--- a/job-cfg/chroot-tests.yaml
+++ b/job-cfg/chroot-tests.yaml
@@ -99,7 +99,7 @@
     name: '{name}_sid_install_xfce'
 
 - job-template:
-    defaults: chroot-tests
+    defaults: chroot-tests+trigger
     name: '{name}_sid_install_full_desktop'
 
 - job-template:
@@ -127,7 +127,7 @@
     name: '{name}_squeeze_install_xfce_upgrade_to_wheezy'
 
 - job-template:
-    defaults: chroot-tests
+    defaults: chroot-tests+trigger
     name: '{name}_squeeze_install_full_desktop_upgrade_to_wheezy'
 
 - job-template:
@@ -155,7 +155,7 @@
     name: '{name}_wheezy_install_xfce'
 
 - job-template:
-    defaults: chroot-tests
+    defaults: chroot-tests+trigger
     name: '{name}_wheezy_install_full_desktop'
 
 - job-template:
@@ -190,6 +190,7 @@
       - '{name}_sid_install_full_desktop':
          chroot_tester_params: 'sid full_desktop'
          my_description: 'Debootstrap sid, then install four desktop environments and the most commonly used applications and packages.'
+         my_trigger: 'chroot-test_sid_install_developer'
 
       - '{name}_sid_install_developer':
          chroot_tester_params: 'sid developer'
@@ -198,7 +199,7 @@
       - '{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, chroot-test_sid_install_developer'
+         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'
 
       - '{name}_squeeze_install_gnome_upgrade_to_wheezy':
          chroot_tester_params: 'squeeze gnome wheezy'
@@ -219,6 +220,7 @@
       - '{name}_squeeze_install_full_desktop_upgrade_to_wheezy':
          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.'
+         my_trigger: 'chroot-test_squeeze_install_developer_upgrade_to_wheezy'
 
       - '{name}_squeeze_install_developer_upgrade_to_wheezy':
          chroot_tester_params: 'sid developer wheezy'
@@ -227,7 +229,7 @@
       - '{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, chroot-test_squeeze_install_developer_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'
 
       - '{name}_wheezy_install_gnome':
          chroot_tester_params: 'wheezy gnome'
@@ -248,6 +250,7 @@
       - '{name}_wheezy_install_full_desktop':
          chroot_tester_params: 'wheezy full_desktop'
          my_description: 'Debootstrap wheezy, then install four desktop environments and the most commonly used applications and packages.'
+         my_trigger: 'chroot-test_wheezy_install_developer'
 
       - '{name}_wheezy_install_developer':
          chroot_tester_params: 'wheezy developer'
@@ -256,7 +259,7 @@
       - '{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, chroot-test_wheezy_install_developer'
+         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'
 
       - '{name}_housekeeping':
          my_description: 'Cleanup so that there is a predictable environment.'