[Qa-jenkins-scm] [jenkins.debian.net] 02/04: packages-tests: DRY distribution matrix, most settings are in common

[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 fd5876d53a77b6f72df1d5f5a1496f9d0d105d7b
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri May 19 13:04:34 2017 +0200

    packages-tests: DRY distribution matrix, most settings are in common
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 job-cfg/packages-tests.yaml | 69 ++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 39 deletions(-)

diff --git a/job-cfg/packages-tests.yaml b/job-cfg/packages-tests.yaml
index c1faadb..91c1ff4 100644
--- a/job-cfg/packages-tests.yaml
+++ b/job-cfg/packages-tests.yaml
@@ -44,21 +44,22 @@
           progressive-delay-maximum: 15
           max-failed-builds: 5
           regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch'
+    my_default_distro_matrix: &distros_defaults
+      - sid: &distro_defaults_sid
+          my_trigger: '{name}_stretch'
+          my_origin_triggers:
+            - pollscm:
+                cron: '* H/2 * * *'
+      - stretch: &distro_defaults_stretch
+          my_trigger: '{name}_jessie'
+      - jessie: &distro_defaults_jessie {}
 
-- job-template:
-    defaults: packages-tests
-    name: '{name}_sid'
-    my_origin_triggers:
-      - pollscm:
-          cron: '* H/2 * * *'
 
 - job-template:
     defaults: packages-tests
-    name: '{name}_stretch'
+    id: simple
+    name: '{name}_{my_distro}'
 
-- job-template:
-    defaults: packages-tests
-    name: '{name}_jessie'
 
 - project:
     name: lintian-tests
@@ -66,15 +67,9 @@
     my_recipients: 'jenkins+debian-qa lintian-maint at debian.org'
     my_shell: 'timeout 6h debian/rules runtests'
     my_description: 'Debian/Lintian testsuite'
+    my_distro: *distros_defaults
     jobs:
-        - '{name}_sid':
-            my_distro: 'sid'
-            my_trigger: '{name}_stretch'
-        - '{name}_stretch':
-            my_distro: 'stretch'
-            my_trigger: '{name}_jessie'
-        - '{name}_jessie':
-            my_distro: 'jessie'
+      - simple
 
 - project:
     name: debhelper-tests
@@ -82,16 +77,13 @@
     my_recipients: 'jenkins+debian-qa debhelper-devel at lists.alioth.debian.org'
     my_shell: 'timeout 6h dpkg-buildpackage -us -uc -tc'
     my_description: 'Debhelper testsuite'
+    my_distro:
+      - sid: *distro_defaults_sid
+      - stretch: *distro_defaults_stretch
+      - jessie:
+          my_disabled: true
     jobs:
-        - '{name}_sid':
-            my_distro: 'sid'
-            my_trigger: '{name}_stretch'
-        - '{name}_stretch':
-            my_distro: 'stretch'
-            my_trigger: '{name}_jessie'
-        - '{name}_jessie':
-            my_distro: 'jessie'
-            my_disabled: true
+      - simple
 
 - project:
     name: dak-tests
@@ -99,16 +91,15 @@
     my_recipients: 'jenkins+debian-ftp debian-dak at lists.debian.org'
     my_shell: 'timeout 1h dpkg-buildpackage -us -uc -tc'
     my_description: 'DAK testsuite'
+    my_distro:
+    # DAK tests cannot be run in sid/stretch atm, but still create the jobs
+      - sid:
+          my_disabled: true
+      - stretch:
+          my_disabled: true
+      - jessie:
+          my_origin_triggers:
+            - pollscm:
+                cron: '* H/2 * * *'
     jobs:
-    # DAK tests cannot be run in sid/stretch atm.
-        - '{name}_sid':
-            my_distro: 'sid'
-            my_disabled: true
-        - '{name}_stretch':
-            my_distro: 'stretch'
-            my_disabled: true
-        - '{name}_jessie':
-            my_distro: 'jessie'
-            my_origin_triggers:
-              - pollscm:
-                  cron: '* H/2 * * *'
+      - simple

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