[Qa-jenkins-scm] [jenkins.debian.net] 02/11: let's see if we can merge the debian & debian-edu bits
Holger Levsen
holger at moszumanska.debian.org
Fri Dec 11 23:16:26 UTC 2015
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 c44eca6dcb25da956872f29ec5f9dbabe7895545
Author: Philip Hands <phil at hands.com>
Date: Fri Jun 26 15:49:47 2015 +0100
let's see if we can merge the debian & debian-edu bits
---
job-cfg/g-i-installation.yaml | 106 +++++++++++++++++++++++-------------------
1 file changed, 59 insertions(+), 47 deletions(-)
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 9d975a1..965f39a 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -95,11 +95,11 @@
- job-template:
defaults: g-i-installation
- name: '{name}_debian_{my_dist}_{my_desktop}'
+ name: '{name}_debian_{my_ver}_{my_desktop}'
- job-template:
defaults: g-i-installation
- name: '{name}_debian-edu_{my_dist}_{my_de_profile}_{my_desktop}'
+ name: '{name}_{my_dist}_{my_ver}_{my_de_profile}_{my_desktop}'
- job-template:
defaults: g-i-installation
@@ -107,26 +107,29 @@
- job-template:
defaults: g-i-installation
- name: '{name}_debian_{my_dist}_presentation'
+ name: '{name}_debian_{my_ver}_presentation'
- job-template:
defaults: g-i-installation
name: '{name}_debian_sid_daily_rescue{my_theme}'
- job-group:
- name: '{name}_debian-edu_group'
+ name: '{name}_{my_dist}_group'
my_disksize: 25
jobs:
- - '{name}_debian-edu_{my_dist}_{my_de_profile}_{my_desktop}':
- my_title: 'Debian Edu ({my_dist}) {my_de_profile}{my_dtdesc}'
- my_inst_url: 'http://ftp.skolelinux.org/cd-{my_dist}-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
- my_description: 'Do a fully automated installation of a Debian Edu {my_dist} {my_de_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_{my_dist}_{my_de_profile}_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+ - '{name}_{my_dist}_{my_ver}_{my_de_profile}_{my_desktop}':
+ my_title: '{my_distname} ({my_ver}) {my_de_profile}{my_title_extra}'
+ my_inst_url: 'http://ftp.skolelinux.org/cd-{my_ver}-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+ my_description: 'Do a fully automated installation of a {my_distname} {my_ver} {my_de_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/{my_dist}_{my_ver}_{my_de_profile}_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
my_trigger: ''
my_recipients: 'jenkins+debian-edu debian-edu-commits at lists.alioth.debian.org'
- job-group:
- name: '{name}_debian-edu_jessie-beta1-netinst_group'
+ name: '{name}_{my_dist}_jessie-beta1-netinst_group'
my_dist:
+ - debian-edu:
+ my_distname: "Debian Edu"
+ my_ver:
- jessie-beta1-netinst:
my_inst_url: http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-CD.iso
- jessie-beta1-usb:
@@ -135,11 +138,11 @@
my_desktop: ''
my_trigger: ''
my_trigdesc: '<br />This job is only triggered manually.'
- my_default_desc: ''
+ my_title_extra: ''
my_recipients: 'jenkins+debian-edu debian-edu-commits at lists.alioth.debian.org'
my_de_profile:
- standalone:
- my_default_desc: ' (Default)'
+ my_title_extra: ' (Default)'
my_disksize: 25
- standalone_mate:
my_disksize: 25
@@ -149,13 +152,16 @@
my_disksize: 60
jobs:
- - '{name}_debian-edu_{my_dist}_{my_de_profile}_{my_desktop}':
- my_title: 'Debian Edu ({my_dist}) {my_de_profile}{my_default_desc}'
- 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_{my_dist}_{my_de_profile}_preseed.cfg">this preseed.cfg</a>) using the {my_dist} image.{my_trigdesc}'
+ - '{name}_{my_dist}_{my_ver}_{my_de_profile}_{my_desktop}':
+ my_title: '{my_distname} ({my_ver}) {my_de_profile}{my_title_extra}'
+ my_description: 'Do a fully automated installation of a {my_distname} Jessie {my_de_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/{my_dist}_{my_ver}_{my_de_profile}_preseed.cfg">this preseed.cfg</a>) using the {my_ver} image.{my_trigdesc}'
- job-group:
- name: '{name}_debian-edu_jessie-daily_group'
+ name: '{name}_{my_dist}_jessie-daily_group'
my_dist:
+ - debian-edu:
+ my_distname: "Debian Edu"
+ my_ver:
- jessie-daily-usb:
my_inst_url: http://ftp.skolelinux.org/cd-jessie-usbstick/debian-edu-amd64-i386-BD-1.iso
- jessie-daily-netinst:
@@ -164,12 +170,12 @@
my_desktop: ''
my_trigger: ''
my_trigdesc: ''
- my_default_desc: ''
+ my_title_extra: ''
my_recipients: 'jenkins+debian-edu debian-edu-commits at lists.alioth.debian.org'
my_de_profile:
- standalone:
my_time: '42 1 */2 * *'
- my_default_desc: ' (Default)'
+ my_title_extra: ' (Default)'
my_disksize: 25
- standalone_mate:
my_time: '42 1 */2 * *' # FIXME: really meant to be the same as above?
@@ -181,12 +187,12 @@
my_time: '42 0 * * *'
my_disksize: 60
jobs:
- - '{name}_debian-edu_{my_dist}_{my_de_profile}_{my_desktop}':
- my_title: 'Debian Edu ({my_dist}) {my_de_profile}{my_default_desc}'
- 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_{my_dist}_{my_de_profile}_preseed.cfg">this preseed.cfg</a>) using the {my_dist} image.{my_trigdesc}'
+ - '{name}_{my_dist}_{my_ver}_{my_de_profile}_{my_desktop}':
+ my_title: '{my_distname} ({my_ver}) {my_de_profile}{my_title_extra}'
+ my_description: 'Do a fully automated installation of a {my_distname} Jessie {my_de_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/{my_dist}_{my_ver}_{my_de_profile}_preseed.cfg">this preseed.cfg</a>) using the {my_ver} image.{my_trigdesc}'
- job-group:
- name: '{name}_debian_{my_dist}_desktops_group'
+ name: '{name}_debian_{my_ver}_desktops_group'
my_optdesc: ''
my_trigger: ''
my_time: ''
@@ -194,9 +200,9 @@
my_optdesc2: ''
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
jobs:
- - '{name}_debian_{my_dist}_{my_desktop}':
+ - '{name}_debian_{my_ver}_{my_desktop}':
my_title: 'Debian ({my_mediadesc}) {my_desktop} desktop install{my_optdesc}'
- my_description: 'Do a fully automated installation of Debian {my_desktop} desktop{my_optdesc}{my_optdesc2} - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_dist}_{my_preseed}_preseed.cfg">this preseed.cfg</a>){my_instdesc}.{my_trigdesc}'
+ my_description: 'Do a fully automated installation of Debian {my_desktop} desktop{my_optdesc}{my_optdesc2} - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_ver}_{my_preseed}_preseed.cfg">this preseed.cfg</a>){my_instdesc}.{my_trigdesc}'
my_disksize: 10
@@ -275,10 +281,13 @@
do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.'
jobs:
- '{name}_maintenance'
- - '{name}_debian-edu_group':
- my_dist: wheezy
+ - '{name}_{my_dist}_group':
+ my_dist:
+ - debian-edu:
+ my_distname: "Debian Edu"
+ my_ver: wheezy
my_desktop: ''
- my_dtdesc: ''
+ my_title_extra: ''
my_de_profile:
- minimal:
my_time: '23 20 15 * *'
@@ -292,22 +301,25 @@
- main-server:
my_time: '42 2 16 * *'
my_disksize: 30
- - '{name}_debian-edu_group':
- my_dist: wheezy
+ - '{name}_{my_dist}_group':
+ my_dist:
+ - debian-edu:
+ my_distname: "Debian Edu"
+ my_ver: wheezy
my_de_profile: standalone
my_desktop:
- gnome:
- my_dtdesc: ' (gnome)'
+ my_title_extra: ' (gnome)'
my_time: '42 18 17 * *'
- lxde:
- my_dtdesc: ' (lxde)'
+ my_title_extra: ' (lxde)'
my_time: '42 22 17 * *'
- xfce:
- my_dtdesc: ' (xfce)'
+ my_title_extra: ' (xfce)'
my_time: '42 2 * * 1'
- - '{name}_debian_{my_dist}_desktops_group':
- my_dist: wheezy
+ - '{name}_debian_{my_ver}_desktops_group':
+ my_ver: wheezy
my_mediadesc: wheezy
my_instdesc: ' using netboot gtk'
my_inst_url: 'http://ftp.de.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/gtk/debian-installer/amd64/'
@@ -325,8 +337,8 @@
my_time: '42 19 4 * *'
my_preseed: 'gnome'
- - '{name}_debian_{my_dist}_desktops_group':
- my_dist: jessie
+ - '{name}_debian_{my_ver}_desktops_group':
+ my_ver: jessie
my_mediadesc: jessie
my_inst_url: 'http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
my_instdesc: ' using netboot gtk'
@@ -343,7 +355,7 @@
- gnome:
my_preseed: gnome
my_time: '42 19 */2 * *'
- my_trigger: 'g-i-installation_debian_{my_dist}_gnome_brltty, g-i-installation_debian_{my_dist}_gnome_speakup'
+ my_trigger: 'g-i-installation_debian_{my_ver}_gnome_brltty, g-i-installation_debian_{my_ver}_gnome_speakup'
- gnome_brltty:
my_preseed: gnome_brltty
my_optdesc: ' with braille display support'
@@ -355,8 +367,8 @@
my_time: ''
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org debian-accessibility at lists.debian.org'
- - '{name}_debian_{my_dist}_desktops_group':
- my_dist: sid_daily
+ - '{name}_debian_{my_ver}_desktops_group':
+ my_ver: sid_daily
my_inst_url: 'http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
my_mediadesc: 'sid daily build CD'
my_instdesc: ' using netboot gtk'
@@ -380,11 +392,11 @@
my_preseed: 'lxde'
my_time: '42 10 * * *'
- - '{name}_debian_{my_dist}_desktops_group':
+ - '{name}_debian_{my_ver}_desktops_group':
my_desktop: kfreebsd_xfce
my_preseed: kfreebsd # FIXME: if this was 'kfreebsd_xfce' we could do without my_preseed
my_instdesc: ' using PXE netboot gtk'
- my_dist:
+ my_ver:
- wheezy:
my_mediadesc: wheezy
my_time: '42 16 21 * *'
@@ -398,14 +410,14 @@
my_inst_url: 'http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/netboot-10/gtk/netboot.tar.gz'
my_time: '42 8 */7 * *'
- - '{name}_debian_{my_dist}_desktops_group':
+ - '{name}_debian_{my_ver}_desktops_group':
my_desktop:
- hurd_lxde:
# for some reason, putting these variables below 'my_desktop' makes them work
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org debian-hurd at lists.debian.org'
my_preseed: hurd_lxde
my_instdesc: ''
- my_dist:
+ my_ver:
- jessie:
my_inst_url: 'http://ftp.debian-ports.org/debian-cd/hurd-i386/debian-hurd-2015/debian-hurd-2015-i386-NETINST-1.iso'
my_time: '42 10 */2 * *'
@@ -417,12 +429,12 @@
my_mediadesc: 'sid daily build CD'
- '{name}_debian_sid_daily_rescue_translations_group'
- - '{name}_debian-edu_jessie-beta1-netinst_group'
- - '{name}_debian-edu_jessie-daily_group'
+ - '{name}_{my_dist}_jessie-beta1-netinst_group'
+ - '{name}_{my_dist}_jessie-daily_group'
- - '{name}_debian_{my_dist}_presentation':
- my_dist:
+ - '{name}_debian_{my_ver}_presentation':
+ my_ver:
- wheezy:
my_mediadesc: 'wheezy netboot'
my_inst_url: 'http://ftp.de.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/debian-installer/amd64/'
@@ -437,7 +449,7 @@
my_time: '42 15 23 * *'
my_title: 'Debian-Installer ({my_mediadesc}) used for presentations'
my_disksize: 1
- my_description: 'Use d-i for presentations via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_dist}_presentation_preseed.cfg">this preseed.cfg</a>).'
+ my_description: 'Use d-i for presentations via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_ver}_presentation_preseed.cfg">this preseed.cfg</a>).'
my_trigger: ''
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list