[Qa-jenkins-scm] [jenkins.debian.net] 09/10: make sure USB image is used for USB build

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 2aabe1ebfa81d82f258f2812bb5e5a6f0f6e52d7
Author: Philip Hands <phil at hands.com>
Date:   Thu Jun 25 09:45:43 2015 +0100

    make sure USB image is used for USB build
---
 job-cfg/g-i-installation.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index f1db830..8344fd5 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.'
 
 # =-=-=-=

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git