diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-01-24 13:24:34 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-01-24 13:24:34 +0100 |
| commit | 200e19a40d68df56bcc7a2435b5e545748cc84da (patch) | |
| tree | b157f04a117588e2a21bc6527d8ae39d0567219e | |
| parent | 1f3cacc6bf14171909cf5c99fb9376722237c032 (diff) | |
| download | jenkins.debian.net-200e19a40d68df56bcc7a2435b5e545748cc84da.tar.xz | |
live-build and lvc: also build debian-edu_jessie_workstation and use xfce for all debian-edu live images
| -rwxr-xr-x | bin/live-build.sh | 6 | ||||
| -rw-r--r-- | job-cfg/live.yaml | 8 | ||||
| -rw-r--r-- | job-cfg/lvc.yaml.py | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/bin/live-build.sh b/bin/live-build.sh index 014cf15b..3082db69 100755 --- a/bin/live-build.sh +++ b/bin/live-build.sh @@ -22,7 +22,11 @@ lb config --distribution $2 --bootappend-live "boot=live config hostname=$1 user cp -rv /srv/jenkins/live/config . case "$3" in standalone) echo education-standalone >> config/package-lists/live.list.chroot - echo education-desktop-mate >> config/package-lists/live.list.chroot + echo education-desktop-xfce >> config/package-lists/live.list.chroot + echo education-laptop >> config/package-lists/live.list.chroot + ;; + workstation) echo education-workstation >> config/package-lists/live.list.chroot + echo education-desktop-xfce >> config/package-lists/live.list.chroot echo education-laptop >> config/package-lists/live.list.chroot ;; gnome) echo task-gnome-desktop >> config/package-lists/live.list.chroot diff --git a/job-cfg/live.yaml b/job-cfg/live.yaml index fdf1f33c..a7f1054a 100644 --- a/job-cfg/live.yaml +++ b/job-cfg/live.yaml @@ -34,6 +34,10 @@ - job-template: defaults: live + name: '{name}_build_debian-edu_jessie_workstation' + +- job-template: + defaults: live name: '{name}_build_debian_jessie_gnome' - job-template: @@ -55,6 +59,10 @@ 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 jessie standalone' + - '{name}_build_debian-edu_jessie_workstation': + my_description: 'Build Debian Edu Jessie live-image with "workstation" profile.' + my_time: '0 12 1 * *' + my_shell: 'schroot --directory /tmp -c source:jenkins-live-jessie /srv/jenkins/bin/live-build.sh debian-edu jessie workstation' - '{name}_build_debian_jessie_gnome': my_description: 'Build Debian Jessie live-image with GNOME desktop.' my_time: '0 13 1 * *' diff --git a/job-cfg/lvc.yaml.py b/job-cfg/lvc.yaml.py index db01cc72..78805459 100644 --- a/job-cfg/lvc.yaml.py +++ b/job-cfg/lvc.yaml.py @@ -4,6 +4,7 @@ images = """ wheezy_standard wheezy_gnome-desktop debian-edu_jessie_standalone + debian-edu_jessie_workstation debian_jessie_gnome debian_jessie_xfce debian_sid_xfce @@ -16,6 +17,7 @@ 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_jessie_standalone_live_amd64.iso', + 'debian-edu_jessie_workstation': '/srv/live-build/results/debian-edu_jessie_workstation_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_sid_xfce': '/srv/live-build/results/debian_sid_xfce_live_amd64.iso' @@ -24,6 +26,7 @@ files = { 'wheezy_standard': '/var/lib/jenkins/debian-live-7.7.0-amd64-standard. 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-edu_jessie_workstation': 'Debian Edu Live 8 Workstation', 'debian_jessie_gnome': 'Debian Live 8 GNOME Desktop', 'debian_jessie_xfce': 'Debian Live 8 Xfce Desktop', 'debian_sid_xfce': 'Debian Live Sid Xfce Desktop', |