summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-01-02 00:06:29 +0100
committerHolger Levsen <holger@layer-acht.org>2015-01-02 00:06:29 +0100
commitfdbd3c03d1d0e1a85a9a8fc58d22e98e33e40d4d (patch)
treee4f564adb309f62ffe3b8c2b91d35f4333dfb1d6
parent43b565aeb6edb73f0977b264aebb95199d82df0e (diff)
downloadjenkins.debian.net-fdbd3c03d1d0e1a85a9a8fc58d22e98e33e40d4d.tar.xz
live: also build debian gnome+xfce jessie live images
-rwxr-xr-xbin/live-build.sh13
-rw-r--r--job-cfg/live.yaml24
2 files changed, 25 insertions, 12 deletions
diff --git a/bin/live-build.sh b/bin/live-build.sh
index e7163eae..f5163eca 100755
--- a/bin/live-build.sh
+++ b/bin/live-build.sh
@@ -12,23 +12,24 @@ cleanup_all() {
}
TMPDIR=$(mktemp --tmpdir=/srv/live-build -d)
-trap cleanup_all INT TERM EXIT
-
cd $TMPDIR
+trap cleanup_all INT TERM EXIT
# $1 is used for the hostname and username
-# $2 is standalone...
+# $2 is choosing the flavor
lb config --distribution jessie --bootappend-live "boot=live config hostname=$1 username=$1"
case "$2" in
standalone) echo education-standalone > config/package-lists/live.list.chroot
;;
+ gnome) echo gnome > config/package-lists/live.list.chroot
+ ;;
+ xfce) echo xfce4 > config/package-lists/live.list.chroot
+ ;;
*) ;;
esac
sudo lb build
-ls -la *.iso || true
mkdir -p /srv/live-build/results
-cp *.iso /srv/live-build/results
-# FIXME: use proper filenames
+cp -v live-image-amd64.hybrid.iso /srv/live-build/results/$1_$2_live_amd64.iso
cleanup_all
trap - INT TERM EXIT
diff --git a/job-cfg/live.yaml b/job-cfg/live.yaml
index a88da9f8..a10efadc 100644
--- a/job-cfg/live.yaml
+++ b/job-cfg/live.yaml
@@ -21,10 +21,6 @@
artifactDaysToKeep: -1
artifactNumToKeep: -1
publishers:
- - logparser:
- parse-rules: '/srv/jenkins/logparse/debian.rules'
- unstable-on-warning: 'true'
- fail-on-error: 'true'
- email:
recipients: 'holger@layer-acht.org'
builders:
@@ -34,7 +30,15 @@
- job-template:
defaults: live
- name: '{name}_build_edu_jessie_standalone'
+ name: '{name}_build_debian-edu_jessie_standalone'
+
+- job-template:
+ defaults: live
+ name: '{name}_build_debian_jessie_gnome'
+
+- job-template:
+ defaults: live
+ name: '{name}_build_debian_jessie_xfce'
- job-template:
defaults: live
@@ -43,10 +47,18 @@
- project:
name: live
jobs:
- - '{name}_build_edu_jessie_standalone':
+ - '{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'
+ - '{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'
+ - '{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'
- '{name}_setup_schroot':
my_description: 'Setup schroot for building live images using live-build in a jessie environment.'
my_time: '42 10 1 * *'