summaryrefslogtreecommitdiffstats
path: root/job-cfg
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2015-06-25 09:45:43 +0100
committerHolger Levsen <holger@layer-acht.org>2015-12-11 23:58:35 +0100
commit2aabe1ebfa81d82f258f2812bb5e5a6f0f6e52d7 (patch)
tree7ef1b8fd7ea32e6c58ed42d8eaf9f2971c34c409 /job-cfg
parentf26f8584f1876d978e5b49f6f6057de6d357a0fa (diff)
downloadjenkins.debian.net-2aabe1ebfa81d82f258f2812bb5e5a6f0f6e52d7.tar.xz
make sure USB image is used for USB build
Diffstat (limited to 'job-cfg')
-rw-r--r--job-cfg/g-i-installation.yaml8
1 files changed, 5 insertions, 3 deletions
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index f1db8302..8344fd5d 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -379,12 +379,14 @@
- main+ltsp-server:
my_disksize: 60
my_image:
- - beta1-netinst
- - beta1-usb
+ - beta1-netinst:
+ my_image_flavour: CD
+ - beta1-usb:
+ my_image_flavour: USB
jobs:
- '{name}_debian-edu_jessie-{my_image}_{my_de_profile}':
my_title: 'Debian Edu (jessie {my_image}) {my_de_profile} (Default)'
- my_shell: '/srv/jenkins/bin/g-i-installation.sh {my_disksize} http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-CD.iso'
+ my_shell: '/srv/jenkins/bin/g-i-installation.sh {my_disksize} http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-{my_image_flavour}.iso'
my_description: 'Do a fully automated installation of a Debian Edu Jessie {my_de_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie-{my_image}_{my_de_profile}_preseed.cfg">this preseed.cfg</a>) using the {my_image} image.<br />This job is only triggered manually.'
# =-=-=-=