From 4b1b2a09d376751a5728137b0e960d5c9704b750 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 30 Apr 2014 22:47:12 +0200 Subject: job-cfg: use countable triggers again --- job-cfg/lintian-tests.yaml | 16 +++++++--------- job-cfg/piuparts.yaml | 3 ++- 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' -- cgit v1.2.3-70-g09d2