summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README2
-rwxr-xr-xbin/chroot-installation.sh4
-rw-r--r--job-cfg/chroot-installation.yaml67
3 files changed, 71 insertions, 2 deletions
diff --git a/README b/README
index 40074bd1..709deaec 100644
--- a/README
+++ b/README
@@ -89,7 +89,7 @@ Installation tests inside chroot environments.
* $distro-bootstrap jobs:
** just `debootstrap $distro` (install a base Debian distribution $distro)
-** there is one job for *sid* and one for *wheezy*: 'chroot-installation_sid_bootstrap' and 'chroot-installation_wheezy_bootstrap'
+** there is one job for *sid*, one for *wheezy* and one for *jessie*: 'chroot-installation_sid_bootstrap', 'chroot-installation_wheezy_bootstrap' and 'chroot-installation_jessie_bootstrap'
* plus there is 'chroot-installation_squeeze_bootstrap_upgrade_to_wheezy', which bootstraps *squeeze* and upgrades that to *wheezy*
** on successful run of the bootstrap job, six $distro-install(+upgrade) jobs are triggered.
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index f8d10c3f..251b5e39 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -132,6 +132,9 @@ case $1 in
wheezy) DISTRO="wheezy"
SPECIFIC="libreoffice virtualbox"
;;
+ jessie) DISTRO="jessie"
+ SPECIFIC="libreoffice virtualbox"
+ ;;
sid) DISTRO="sid"
SPECIFIC="libreoffice virtualbox"
;;
@@ -169,6 +172,7 @@ if [ "$3" != "" ] ; then
case $3 in
squeeze)upgrade2 squeeze;;
wheezy) upgrade2 wheezy;;
+ jessie) upgrade2 jessie;;
sid) upgrade2 sid;;
*) echo "unsupported distro." ; exit 1 ;;
esac
diff --git a/job-cfg/chroot-installation.yaml b/job-cfg/chroot-installation.yaml
index e376ba7c..af826aae 100644
--- a/job-cfg/chroot-installation.yaml
+++ b/job-cfg/chroot-installation.yaml
@@ -178,6 +178,38 @@
defaults: chroot-installation+trigger
name: '{name}_wheezy_bootstrap'
+- job-template:
+ defaults: chroot-installation
+ name: '{name}_jessie_install_gnome'
+
+- job-template:
+ defaults: chroot-installation
+ name: '{name}_jessie_install_kde'
+
+- job-template:
+ defaults: chroot-installation
+ name: '{name}_jessie_install_kde-full'
+
+- job-template:
+ defaults: chroot-installation
+ name: '{name}_jessie_install_lxde'
+
+- job-template:
+ defaults: chroot-installation
+ name: '{name}_jessie_install_xfce'
+
+- job-template:
+ defaults: chroot-installation
+ name: '{name}_jessie_install_full_desktop'
+
+- job-template:
+ defaults: chroot-installation
+ name: '{name}_jessie_install_developer'
+
+- job-template:
+ defaults: chroot-installation+trigger
+ name: '{name}_jessie_bootstrap'
+
- project:
name: chroot-installation
do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git;a=blob;f=job-cfg/chroot-installation.yaml">chroot-installation.yaml</a>.'
@@ -281,7 +313,40 @@
my_description: 'Debootstrap wheezy.'
my_trigger: 'chroot-installation_wheezy_install_gnome, chroot-installation_wheezy_install_kde, chroot-installation_wheezy_install_kde-full, chroot-installation_wheezy_install_lxde, chroot-installation_wheezy_install_xfce, chroot-installation_wheezy_install_full_desktop, chroot-installation_wheezy_install_developer'
+ - '{name}_jessie_install_gnome':
+ installation_params: 'jessie gnome'
+ my_description: 'Debootstrap jessie, then install GNOME.'
+
+ - '{name}_jessie_install_kde':
+ installation_params: 'jessie kde'
+ my_description: 'Debootstrap jessie, then install KDE plasma desktop.'
+
+ - '{name}_jessie_install_kde-full':
+ installation_params: 'jessie kde-full'
+ my_description: 'Debootstrap jessie, then install complete KDE desktop.'
+
+ - '{name}_jessie_install_xfce':
+ installation_params: 'jessie xfce'
+ my_description: 'Debootstrap jessie, then install XFCE.'
+
+ - '{name}_jessie_install_lxde':
+ installation_params: 'jessie lxde'
+ my_description: 'Debootstrap jessie, then install LXDE.'
+
+ - '{name}_jessie_install_full_desktop':
+ installation_params: 'jessie full_desktop'
+ my_description: 'Debootstrap jessie, then install four desktop environments and the most commonly used applications and packages.'
+
+ - '{name}_jessie_install_developer':
+ installation_params: 'jessie developer'
+ my_description: 'Debootstrap jessie, then install four desktop environments and the most commonly used applications and packages - and the build depends for all of these.'
+
+ - '{name}_jessie_bootstrap':
+ installation_params: 'jessie'
+ my_description: 'Debootstrap jessie.'
+ my_trigger: 'chroot-installation_jessie_install_gnome, chroot-installation_jessie_install_kde, chroot-installation_jessie_install_kde-full, chroot-installation_jessie_install_lxde, chroot-installation_jessie_install_xfce, chroot-installation_jessie_install_full_desktop, chroot-installation_jessie_install_developer'
+
- '{name}_housekeeping':
my_description: 'Cleanup and monitor so that there is a predictable environment.'
- my_trigger: 'chroot-installation_sid_bootstrap, chroot-installation_wheezy_bootstrap, chroot-installation_squeeze_bootstrap_upgrade_to_wheezy'
+ my_trigger: 'chroot-installation_sid_bootstrap, chroot-installation_wheezy_bootstrap, chroot-installation_jessie_bootstrap, chroot-installation_squeeze_bootstrap_upgrade_to_wheezy'