job-cfg: correct publishers and triggers once again

3 files changed, 19 insertions, 13 deletions

diff --git a/job-cfg/dvswitch.yaml b/job-cfg/dvswitch.yaml
index 676be7bc..fd0c5d33 100644
--- a/job-cfg/dvswitch.yaml
+++ b/job-cfg/dvswitch.yaml
@@ -42,7 +42,7 @@
       - email:
           recipients: 'jenkins+dvswitch holger@layer-acht.org dvswitch-maint@debian.org'
       - trigger:
-          project: '{name}_wheezy'
+          project: '{my_trigger}'
 
 - job-template:
     defaults: dvswitch
@@ -53,7 +53,7 @@
       - email:
           recipients: 'jenkins+dvswitch holger@layer-acht.org wouter@debian.org'
       - trigger:
-          project: '{name}_jessie'
+          project: '{my_trigger}'
 
 - job-template:
     defaults: dvswitch
@@ -76,15 +76,16 @@
             my_distro: 'sid'
             my_shell: 'debian/rules build'
             my_description: 'Build the dvswitch git master branch on sid.'
+            my_trigger: 'dvswitch_jessie'
         - '{name}_jessie':
             my_distro: 'jessie'
             my_shell: 'debian/rules build'
             my_description: 'Build the dvswitch git master branch on jessie.'
+            my_trigger: 'dvswitch_wheezy'
         - '{name}_wheezy':
             my_distro: 'wheezy backports'
             my_shell: 'debian/rules build'
             my_description: 'Build the dvswitch git master branch on wheezy (+backports).'
-
         - '{name}_against_libav_git':
             my_distro: 'sid'
             my_shell: '"apt-get -y build-dep dvswitch libav ; ./configure ; make ; make install ; cd .. ; git clone git://anonscm.debian.org/dvswitch/dvswitch.git ; cd dvswitch ; mk-build-deps -ir ; ./debian/rules build"'
diff --git a/job-cfg/lintian-tests.yaml b/job-cfg/lintian-tests.yaml
index 776b83eb..64067927 100644
--- a/job-cfg/lintian-tests.yaml
+++ b/job-cfg/lintian-tests.yaml
@@ -27,18 +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: '{my_trigger}'
 
@@ -48,6 +50,8 @@
     triggers:
       - pollscm: '*/6 * * * *'
     publishers:
+      - email:
+          recipients: 'jenkins+debian-qa holger@layer-acht.org lintian-maint@debian.org'
       - trigger:
           project: '{my_trigger}'
 
@@ -58,12 +62,12 @@
             my_distro: 'sid'
             my_shell: 'debian/rules runtests'
             my_description: 'Debian/Lintian testsuite running on sid.'
-            my_trigger: '{name}_jessie'
+            my_trigger: 'lintian-tests_jessie'
         - '{name}_jessie':
             my_distro: 'jessie'
             my_shell: 'debian/rules runtests'
             my_description: 'Debian/Lintian testsuite running on jessie.'
-            my_trigger: '{name}_wheezy'
+            my_trigger: 'lintian-tests_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 63631c90..1bccb2bd 100644
--- a/job-cfg/piuparts.yaml
+++ b/job-cfg/piuparts.yaml
@@ -23,14 +23,13 @@
             - develop
     builders:
       - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}'
-    publishers:
-      - email:
-          recipients: 'jenkins+debian-qa holger@layer-acht.org piuparts-devel@lists.alioth.debian.org'
-
 
 - job-template:
     defaults: piuparts
     name: '{name}_jessie'
+    publishers:
+      - email:
+          recipients: 'jenkins+debian-qa holger@layer-acht.org piuparts-devel@lists.alioth.debian.org'
 
 - job-template:
     defaults: piuparts
@@ -38,6 +37,8 @@
     triggers:
       - pollscm: '*/6 * * * *'
     publishers:
+      - email:
+          recipients: 'jenkins+debian-qa holger@layer-acht.org piuparts-devel@lists.alioth.debian.org'
       - trigger:
           project: '{my_trigger}'
 
@@ -48,7 +49,7 @@
             my_distro: 'sid'
             my_shell: 'debian/rules check'
             my_description: 'piuparts testsuite running on sid.'
-            my_trigger: '{name}_jessie'
+            my_trigger: 'piuparts_jessie'
         - '{name}_jessie':
             my_distro: 'jessie'
             my_shell: 'debian/rules check'