summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-06-14 11:37:11 +0200
committerHolger Levsen <holger@layer-acht.org>2013-06-14 11:37:11 +0200
commit9002fc3bffd5be5260b13b5a36cef8f468eb2fda (patch)
treebac20e7c6ba7bdb1abd455575b6dd78ca39ac33b
parent88de582a8a0a136632d0cb040a30b4d01ed8fa27 (diff)
parent37eb00f6cd2de9a33f72f171878ea0f9c8e38bf1 (diff)
downloadjenkins.debian.net-9002fc3bffd5be5260b13b5a36cef8f468eb2fda.tar.xz
Merge branch 'jessie'
Conflicts: job-cfg/g-i-installation.yaml fixed some timings too
-rw-r--r--job-cfg/g-i-installation.yaml14
1 files changed, 12 insertions, 2 deletions
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index be865905..5bee5fc5 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -85,6 +85,10 @@
- job-template:
defaults: g-i-installation
+ name: '{name}_debian-edu_testing_standalone'
+
+- job-template:
+ defaults: g-i-installation
name: '{name}_debian-edu_wheezy-test_minimal'
- job-template:
@@ -504,7 +508,7 @@
my_title: 'Debian Edu (wheezy-test) standalone (gnome)'
my_shell: '/srv/jenkins/bin/g-i-installation.sh 40 debian-edu_wheezy-test_standalone_gnome 25 http://ftp.skolelinux.org/cd-wheezy-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
my_description: 'Do a fully automated installation of a Debian Edu Wheezy standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
- my_timed: '42 20 * * 1,3,5,7'
+ my_timed: '42 18 * * 1,3,5,7'
my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
- '{name}_debian-edu_wheezy-test_standalone_lxde':
my_title: 'Debian Edu (wheezy-test) standalone (lxde)'
@@ -516,5 +520,11 @@
my_title: 'Debian Edu (wheezy-test) standalone (xfce)'
my_shell: '/srv/jenkins/bin/g-i-installation.sh 42 debian-edu_wheezy-test_standalone_xfce 25 http://ftp.skolelinux.org/cd-wheezy-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
my_description: 'Do a fully automated installation of a Debian Edu Wheezy standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
- my_timed: '42 20 * * 1,3,5,7'
+ my_timed: '42 22 * * 1,3,5,7'
+ my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
+ - '{name}_debian-edu_testing_standalone':
+ my_title: 'Debian Edu (testing) standalone'
+ my_shell: '/srv/jenkins/bin/g-i-installation.sh 43 debian-edu_testing_standalone 25 http://ftp.skolelinux.org/cd-edu-testing-nolocal-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+ my_description: 'Do a fully automated installation of a Debian Edu Testing standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_testing_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+ my_timed: '42 0 * * 1,11,21'
my_recipients: 'jenkins+debian-edu holger@layer-acht.org'