summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-04-30 22:47:12 +0200
committerHolger Levsen <holger@layer-acht.org>2014-04-30 22:47:12 +0200
commit4b1b2a09d376751a5728137b0e960d5c9704b750 (patch)
tree9fdcd3b9ca654c9554243d8d0147a54c4198e6a3
parent69c001a27332d257808d4f6792bf25832e5e30ae (diff)
downloadjenkins.debian.net-4b1b2a09d376751a5728137b0e960d5c9704b750.tar.xz
job-cfg: use countable triggers again
-rw-r--r--job-cfg/lintian-tests.yaml16
-rw-r--r--job-cfg/piuparts.yaml3
2 files changed, 9 insertions, 10 deletions
diff --git a/job-cfg/lintian-tests.yaml b/job-cfg/lintian-tests.yaml
index 8b3dd383..776b83eb 100644
--- a/job-cfg/lintian-tests.yaml
+++ b/job-cfg/lintian-tests.yaml
@@ -27,22 +27,20 @@
- master
builders:
- shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}'
+ publishers:
+ - email:
+ recipients: 'jenkins+debian-qa holger@layer-acht.org lintian-maint@debian.org'
- job-template:
defaults: lintian-tests
name: '{name}_wheezy'
- publishers:
- - email:
- recipients: 'jenkins+debian-qa holger@layer-acht.org lintian-maint@debian.org'
- job-template:
defaults: lintian-tests
name: '{name}_jessie'
publishers:
- - email:
- recipients: 'jenkins+debian-qa holger@layer-acht.org lintian-maint@debian.org'
- trigger:
- project: '{name}_wheezy'
+ project: '{my_trigger}'
- job-template:
defaults: lintian-tests
@@ -50,10 +48,8 @@
triggers:
- pollscm: '*/6 * * * *'
publishers:
- - email:
- recipients: 'jenkins+debian-qa holger@layer-acht.org lintian-maint@debian.org'
- trigger:
- project: '{name}_jessie'
+ project: '{my_trigger}'
- project:
name: lintian-tests
@@ -62,10 +58,12 @@
my_distro: 'sid'
my_shell: 'debian/rules runtests'
my_description: 'Debian/Lintian testsuite running on sid.'
+ my_trigger: '{name}_jessie'
- '{name}_jessie':
my_distro: 'jessie'
my_shell: 'debian/rules runtests'
my_description: 'Debian/Lintian testsuite running on jessie.'
+ my_trigger: '{name}_wheezy'
- '{name}_wheezy':
my_distro: 'wheezy backports'
my_shell: 'debian/rules runtests'
diff --git a/job-cfg/piuparts.yaml b/job-cfg/piuparts.yaml
index 019495d7..63631c90 100644
--- a/job-cfg/piuparts.yaml
+++ b/job-cfg/piuparts.yaml
@@ -39,7 +39,7 @@
- pollscm: '*/6 * * * *'
publishers:
- trigger:
- project: '{name}_jessie'
+ project: '{my_trigger}'
- project:
name: piuparts
@@ -48,6 +48,7 @@
my_distro: 'sid'
my_shell: 'debian/rules check'
my_description: 'piuparts testsuite running on sid.'
+ my_trigger: '{name}_jessie'
- '{name}_jessie':
my_distro: 'jessie'
my_shell: 'debian/rules check'