[Qa-jenkins-scm] [jenkins.debian.net] 05/07: reproducible: further DRY the defaults by de-duplicating email conf

[Holger Levsen]

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 c8baabe511fcda9fc198214b8b15bd4a282cf5c4
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed May 17 10:46:13 2017 +0200

    reproducible: further DRY the defaults by de-duplicating email conf
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 job-cfg/reproducible.yaml | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index f5cebf6..722a1b0 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -27,11 +27,11 @@
     builders:
       - shell: '{my_shell}'
     publishers:
-      - logparser: &logparse
+      - logparser: &logparser
           parse-rules: '/srv/jenkins/logparse/reproducible.rules'
           unstable-on-warning: 'true'
           fail-on-error: 'true'
-      - email:
+      - email: &email
           recipients: '{my_recipients}'
     node: '{my_node}'
 
@@ -43,9 +43,8 @@
       - pollscm:
           cron: '{my_scmpoll}'
     publishers:
-      - logparser: *logparse
-      - email:
-          recipients: '{my_recipients}'
+      - logparser: *logparser
+      - email: *email
       - naginator: &naginator
           progressive-delay-increment: 5
           progressive-delay-maximum: 15
@@ -75,7 +74,7 @@
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
     publishers:
-      - logparser: *logparse
+      - logparser: *logparser
       - email:
           recipients: '{my_recipients}'
           notify-every-unstable-build: false
@@ -86,12 +85,10 @@
     <<: *DEFAULTS
     name: reproducible_other_projects
     publishers:
-      - logparser:
+      - logparser: &logparser-extra
+          <<: *logparser
           parse-rules: '/srv/jenkins/logparse/reproducible-extra.rules'
-          unstable-on-warning: 'true'
-          fail-on-error: 'true'
-      - email:
-          recipients: '{my_recipients}'
+      - email: *email
 
 - defaults:
     <<: *DEFAULTS
@@ -102,11 +99,9 @@
           cron: '*/6 * * * *'
     publishers:
       - logparser:
+          <<: *logparser
           parse-rules: '{my_parse_rules}'
-          unstable-on-warning: 'true'
-          fail-on-error: 'true'
-      - email:
-          recipients: '{my_recipients}'
+      - email: *email
       - naginator: *naginator
     scm:
       - git:
@@ -118,12 +113,8 @@
     <<: *DEFAULTS
     name: reproducible_other_projects_trigger
     publishers:
-      - logparser:
-          parse-rules: '/srv/jenkins/logparse/reproducible-extra.rules'
-          unstable-on-warning: 'true'
-          fail-on-error: 'true'
-      - email:
-          recipients: '{my_recipients}'
+      - logparser: *logparser-extra
+      - email: *email
       - trigger:
           project: '{my_trigger}'
 
@@ -131,16 +122,12 @@
     <<: *DEFAULTS
     name: reproducible_other_projects_artifacts
     publishers:
-      - logparser:
-          parse-rules: '/srv/jenkins/logparse/reproducible-extra.rules'
-          unstable-on-warning: 'true'
-          fail-on-error: 'true'
+      - logparser: *logparser-extra
       - archive:
           artifacts: 'results/*.*'
           latest-only: false
           allow-empty: true
-      - email:
-          recipients: '{my_recipients}'
+      - email: *email
       - trigger:
           project: '{my_trigger}'
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git