[Qa-jenkins-scm] [jenkins.debian.net] 03/07: reproducible: even more DRY by sharing the same defaults

[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 7b5b90d29aa4e287cc34d57e2445ef4fa3d5f666
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed May 17 10:19:56 2017 +0200

    reproducible: even more DRY by sharing the same defaults
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 job-cfg/reproducible.yaml | 68 +++++------------------------------------------
 1 file changed, 7 insertions(+), 61 deletions(-)

diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 6850263..5a8eea6 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -1,4 +1,4 @@
-- defaults:
+- defaults: &DEFAULTS
     name: reproducible
     project-type: freestyle
     my_disabled:
@@ -36,19 +36,12 @@
     node: '{my_node}'
 
 - defaults:
+    <<: *DEFAULTS
     name: reproducible_git
-    project-type: freestyle
-    my_disabled:
-    disabled: '{obj:my_disabled}'
-    description: *desc
-    properties: *sidebar
     triggers:
       - timed: '{my_timed}'
       - pollscm:
           cron: '{my_scmpoll}'
-    logrotate: *logrotate
-    builders:
-      - shell: '{my_shell}'
     publishers:
       - logparser: *logparse
       - email:
@@ -63,22 +56,16 @@
           url: '{my_gitrepo}'
           branches:
             - master
-    node: '{my_node}'
 
 - defaults:
+    <<: *DEFAULTS
     name: reproducible_builder_trigger
-    project-type: freestyle
-    my_disabled:
-    disabled: '{obj:my_disabled}'
-    description: *desc
     properties:
       - sidebar: *sb1
       - sidebar: *sb2
       - sidebar: *sb3
       - priority-sorter:
           priority: '150'
-    triggers:
-      - timed: '{my_timed}'
     wrappers:
       - timeout:
           timeout: 1560
@@ -87,8 +74,6 @@
       numToKeep: 300
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
-    builders:
-      - shell: '{my_shell}'
     publishers:
       - logparser: *logparse
       - email:
@@ -96,20 +81,10 @@
           notify-every-unstable-build: false
       - trigger:
           project: '{my_trigger}'
-    node: '{my_node}'
 
 - defaults:
+    <<: *DEFAULTS
     name: reproducible_other_projects
-    project-type: freestyle
-    my_disabled:
-    disabled: '{obj:my_disabled}'
-    description: *desc
-    properties: *sidebar
-    triggers:
-      - timed: '{my_timed}'
-    logrotate: *logrotate
-    builders:
-      - shell: '{my_shell}'
     publishers:
       - logparser:
           parse-rules: '/srv/jenkins/logparse/reproducible-extra.rules'
@@ -117,22 +92,14 @@
           fail-on-error: 'true'
       - email:
           recipients: '{my_recipients}'
-    node: '{my_node}'
 
 - defaults:
+    <<: *DEFAULTS
     name: reproducible_other_projects_git
-    project-type: freestyle
-    my_disabled:
-    disabled: '{obj:my_disabled}'
-    description: *desc
-    properties: *sidebar
     triggers:
       - timed: '{my_timed}'
       - pollscm:
           cron: '*/6 * * * *'
-    logrotate: *logrotate
-    builders:
-      - shell: '{my_shell}'
     publishers:
       - logparser:
           parse-rules: '{my_parse_rules}'
@@ -150,20 +117,10 @@
           url: '{my_gitrepo}'
           branches:
             - '{my_gitbranches}'
-    node: '{my_node}'
 
 - defaults:
+    <<: *DEFAULTS
     name: reproducible_other_projects_trigger
-    project-type: freestyle
-    my_disabled:
-    disabled: '{obj:my_disabled}'
-    description: *desc
-    properties: *sidebar
-    triggers:
-      - timed: '{my_timed}'
-    logrotate: *logrotate
-    builders:
-      - shell: '{my_shell}'
     publishers:
       - logparser:
           parse-rules: '/srv/jenkins/logparse/reproducible-extra.rules'
@@ -173,20 +130,10 @@
           recipients: '{my_recipients}'
       - trigger:
           project: '{my_trigger}'
-    node: '{my_node}'
 
 - defaults:
+    <<: *DEFAULTS
     name: reproducible_other_projects_artifacts
-    project-type: freestyle
-    my_disabled:
-    disabled: '{obj:my_disabled}'
-    description: *desc
-    properties: *sidebar
-    triggers:
-      - timed: '{my_timed}'
-    logrotate: *logrotate
-    builders:
-      - shell: '{my_shell}'
     publishers:
       - logparser:
           parse-rules: '/srv/jenkins/logparse/reproducible-extra.rules'
@@ -200,7 +147,6 @@
           recipients: '{my_recipients}'
       - trigger:
           project: '{my_trigger}'
-    node: '{my_node}'
 
 - job-template:
     defaults: reproducible

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