diff options
| -rw-r--r-- | README | 8 | ||||
| -rwxr-xr-x | bin/chroot_tester.sh | 24 | ||||
| -rw-r--r-- | job-cfg/chroot-tests.yaml | 54 |
3 files changed, 73 insertions, 13 deletions
@@ -36,7 +36,12 @@ Remember, this is still pretty much work in progress. If you can think of ways t ** triggers the install_gnome job on success * chroot-test_sid_install_gnome ** debootstrap a sid chroot and install gnome -* chroot-test_sid_install_kde, chroot-test_sid_install_xfce and chroot-test_sid_install_lxce _do not exit yet_. +* chroot-test_sid_install_kde +** debootstrap a sid chroot and install kde +* chroot-test_sid_install_lxde +** debootstrap a sid chroot and install lxde +* chroot-test_sid_install_xfce +** debootstrap a sid chroot and install xfce * chroot-test_squeeze_bootstrap_upgrade_to_wheezy ** debootstrap a squeeze chroot and upgrade it to wheezy ** triggers the upgrade_(gnome|kde|lxde|xfce) jobs on success @@ -59,6 +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 === debian-installer jobs 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 diff --git a/job-cfg/chroot-tests.yaml b/job-cfg/chroot-tests.yaml index aaa67d23..4b477ddb 100644 --- a/job-cfg/chroot-tests.yaml +++ b/job-cfg/chroot-tests.yaml @@ -87,6 +87,22 @@ name: '{name}_sid_install_gnome' - job-template: + defaults: chroot-tests + name: '{name}_sid_install_kde' + +- job-template: + defaults: chroot-tests + name: '{name}_sid_install_lxde' + +- job-template: + defaults: chroot-tests + name: '{name}_sid_install_xfce' + +- job-template: + defaults: chroot-tests + name: '{name}_sid_install_full_desktop' + +- job-template: defaults: chroot-tests+trigger name: '{name}_sid_bootstrap' @@ -107,6 +123,10 @@ name: '{name}_squeeze_install_xfce_upgrade_to_wheezy' - job-template: + defaults: chroot-tests + name: '{name}_squeeze_install_full_desktop_upgrade_to_wheezy' + +- job-template: defaults: chroot-tests+trigger name: '{name}_squeeze_bootstrap_upgrade_to_wheezy' @@ -127,6 +147,10 @@ name: '{name}_wheezy_install_xfce' - job-template: + defaults: chroot-tests + name: '{name}_wheezy_install_full_desktop' + +- job-template: defaults: chroot-tests+trigger name: '{name}_wheezy_bootstrap' @@ -139,10 +163,26 @@ chroot_tester_params: 'sid gnome' my_description: 'Debootstrap sid, then install GNOME.' + - '{name}_sid_install_kde': + chroot_tester_params: 'sid kde' + my_description: 'Debootstrap sid, then install KDE.' + + - '{name}_sid_install_lxde': + chroot_tester_params: 'sid lxde' + my_description: 'Debootstrap sid, then install LXDE.' + + - '{name}_sid_install_xfce': + chroot_tester_params: 'sid xfce' + my_description: 'Debootstrap sid, then install XFCE.' + + - '{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.' + - '{name}_sid_bootstrap': chroot_tester_params: 'sid' my_description: 'Debootstrap sid.' - my_trigger: 'chroot-test_sid_install_gnome' + 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' @@ -160,10 +200,14 @@ chroot_tester_params: 'squeeze xfce wheezy' my_description: 'Debootstrap squeeze, install KFCE then upgrade to wheezy.' + - '{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.' + - '{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' + 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' @@ -181,10 +225,14 @@ chroot_tester_params: 'wheezy lxde' my_description: 'Debootstrap wheezy, then install LXDE.' + - '{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.' + - '{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' + 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.' |