lvc-tests and live-build: new jobs for building and testing Debian sid xfce live .isos

3 files changed, 24 insertions, 12 deletions

diff --git a/bin/live-build.sh b/bin/live-build.sh
index f5163eca..e28c80ba 100755
--- a/bin/live-build.sh
+++ b/bin/live-build.sh
@@ -16,9 +16,10 @@ cd $TMPDIR
 trap cleanup_all INT TERM EXIT
 
 # $1 is used for the hostname and username
-# $2 is choosing the flavor
-lb config --distribution jessie --bootappend-live "boot=live config hostname=$1 username=$1"
-case "$2" in
+# $2 is used for the suite
+# $3 is choosing the flavor
+lb config --distribution $2 --bootappend-live "boot=live config hostname=$1 username=$1"
+case "$3" in
 	standalone)	echo education-standalone > config/package-lists/live.list.chroot
 			;;
 	gnome)		echo gnome > config/package-lists/live.list.chroot
@@ -29,7 +30,7 @@ case "$2" in
 esac
 sudo lb build
 mkdir -p /srv/live-build/results
-cp -v live-image-amd64.hybrid.iso /srv/live-build/results/$1_$2_live_amd64.iso
+cp -v live-image-amd64.hybrid.iso /srv/live-build/results/$1_$2_$3_live_amd64.iso
 
 cleanup_all
 trap - INT TERM EXIT
diff --git a/job-cfg/live.yaml b/job-cfg/live.yaml
index a10efadc..fdf1f33c 100644
--- a/job-cfg/live.yaml
+++ b/job-cfg/live.yaml
@@ -42,6 +42,10 @@
 
 - job-template:
     defaults: live
+    name: '{name}_build_debian_sid_xfce'
+
+- job-template:
+    defaults: live
     name: '{name}_setup_schroot'
 
 - project:
@@ -50,15 +54,19 @@
        - '{name}_build_debian-edu_jessie_standalone':
            my_description: 'Build Debian Edu Jessie live-image with "standlone" profile.'
            my_time: '0 12 1 * *'
-           my_shell: 'schroot --directory /tmp -c source:jenkins-live-jessie /srv/jenkins/bin/live-build.sh debian-edu standalone'
+           my_shell: 'schroot --directory /tmp -c source:jenkins-live-jessie /srv/jenkins/bin/live-build.sh debian-edu jessie standalone'
        - '{name}_build_debian_jessie_gnome':
            my_description: 'Build Debian Jessie live-image with GNOME desktop.'
            my_time: '0 13 1 * *'
-           my_shell: 'schroot --directory /tmp -c source:jenkins-live-jessie /srv/jenkins/bin/live-build.sh debian gnome'
+           my_shell: 'schroot --directory /tmp -c source:jenkins-live-jessie /srv/jenkins/bin/live-build.sh debian jessie gnome'
        - '{name}_build_debian_jessie_xfce':
            my_description: 'Build Debian Jessie live-image with Xfce desktop.'
            my_time: '0 14 1 * *'
-           my_shell: 'schroot --directory /tmp -c source:jenkins-live-jessie /srv/jenkins/bin/live-build.sh debian xfce'
+           my_shell: 'schroot --directory /tmp -c source:jenkins-live-jessie /srv/jenkins/bin/live-build.sh debian jessie xfce'
+       - '{name}_build_debian_sid_xfce':
+           my_description: 'Build Debian Sid live-image with Xfce desktop.'
+           my_time: '0 14 2 * *'
+           my_shell: 'schroot --directory /tmp -c source:jenkins-live-jessie /srv/jenkins/bin/live-build.sh debian sid xfce'
        - '{name}_setup_schroot':
            my_description: 'Setup schroot for building live images using live-build in a jessie environment.'
            my_time: '42 10 1 * *'
diff --git a/job-cfg/lvc.yaml.py b/job-cfg/lvc.yaml.py
index 87db4f76..1f183d11 100644
--- a/job-cfg/lvc.yaml.py
+++ b/job-cfg/lvc.yaml.py
@@ -6,6 +6,7 @@ images = """
     debian-edu_jessie_standalone
     debian_jessie_gnome
     debian_jessie_xfce
+    debian_sid_xfce
    """.split()
 
 features = """
@@ -14,16 +15,18 @@ features = """
 
 files = { 'wheezy_standard': '/var/lib/jenkins/debian-live-7.7.0-amd64-standard.iso',
           'wheezy_gnome-desktop': '/var/lib/jenkins/debian-live-7.7.0-amd64-gnome-desktop.iso',
-          'debian-edu_jessie_standalone': '/srv/live-build/results/debian-edu_standalone_live_amd64.iso',
-          'debian_jessie_gnome': '/srv/live-build/results/debian_gnome_live_amd64.iso',
-          'debian_jessie_xfce': '/srv/live-build/results/debian_xfce_live_amd64.iso'
+          'debian-edu_jessie_standalone': '/srv/live-build/results/debian-edu_jessie_standalone_live_amd64.iso',
+          'debian_jessie_gnome': '/srv/live-build/results/debian_jessie_gnome_live_amd64.iso',
+          'debian_jessie_xfce': '/srv/live-build/results/debian_jessie_xfce_live_amd64.iso',
+          'debian_jessie_xfce': '/srv/live-build/results/debian_sid_xfce_live_amd64.iso'
         }
 
 titles = { 'wheezy_standard': 'Debian Live 7 standard',
            'wheezy_gnome-desktop': 'Debian Live 7 GNOME desktop',
            'debian-edu_jessie_standalone': 'Debian Edu Live 8 Standalone',
-           'debian_jessie_gnome': 'Debian Edu Live 8 GNOME Desktop',
-           'debian_jessie_xfce': 'Debian Edu Live 8 Xfce Desktop'
+           'debian_jessie_gnome': 'Debian Live 8 GNOME Desktop',
+           'debian_jessie_xfce': 'Debian Live 8 Xfce Desktop',
+           'debian_sid_xfce': 'Debian Live Sid Xfce Desktop',
          }
 
 print("""