[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible Debian: correctly configure naginator plugin

[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 d5cbb0757ef6bfd9b2ab5881bad001fa9bd9a1c2
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jun 20 18:31:32 2017 +0200

    reproducible Debian: correctly configure naginator plugin
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 job-cfg/reproducible.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index fd29ece..7117f13 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -37,7 +37,7 @@
           progressive-delay-increment: 5
           progressive-delay-maximum: 15
           max-failed-builds: 5
-          regular-expression: '^E: Couldn't download .*/Packages'
+          regular-expression: '{my_naginator_regex}'
     node: '{my_node}'
 
 - defaults:
@@ -50,11 +50,7 @@
     publishers:
       - logparser: *logparser
       - email: *email
-      - naginator: &naginator
-          progressive-delay-increment: 5
-          progressive-delay-maximum: 15
-          max-failed-builds: 5
-          regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch'
+      - naginator: *naginator
     scm:
       - git:
           url: '{my_gitrepo}'
@@ -452,6 +448,7 @@
                 - 'codethink15':    { my_arch: 'arm64' }
                 - 'codethink16':    { my_arch: 'arm64' }
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
+            my_naginator_regex: '^E: Couldn't download .*/Packages'
 
         - '{name}_setup_schroot_{my_distro}_{my_arch}_{my_hname}':
             my_distro:
@@ -481,6 +478,7 @@
             my_hname:
                 - 'jenkins':        { my_arch: 'amd64' }
             my_node: ''
+            my_naginator_regex: '^E: Couldn't download .*/Packages'
 
         - '{name}_{my_task}_{my_arch}_{my_hname}':
             my_task:
@@ -490,6 +488,7 @@
                     my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_hname:
                 - 'profitbricks3':  { my_arch: 'amd64' }
+            my_naginator_regex: '^E: Couldn't download .*/Packages'
 
         - '{name}_{my_task}':
             my_task:
@@ -588,6 +587,7 @@
                     my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm at lists.alioth.debian.org'
             my_gitrepo: 'git://git.debian.org/git/reproducible/{my_reponame}.git'
             my_hname: ''
+            my_naginator_regex: 'Caused by: hudson.plugins.git.GitException: Command "git fetch'
 
         - '{name}_{otherproject_artifacts}':
             otherproject_artifacts:
@@ -679,6 +679,7 @@
             my_gitbranches: 'master'
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_parse_rules: '/srv/jenkins/logparse/reproducible-extra.rules'
+            my_naginator_regex: 'Caused by: hudson.plugins.git.GitException: Command "git fetch'
 
         - '{name}_{otherproject_git}':
             otherproject_git:
@@ -718,6 +719,7 @@
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_parse_rules: '/srv/jenkins/logparse/reproducible-extra.rules'
             my_hname: ''
+            my_naginator_regex: 'Caused by: hudson.plugins.git.GitException: Command "git fetch'
 
         - '{name}_{otherproject_git_junit_exports}':
             otherproject_git_junit_exports:

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