diff options
| author | Philip Hands <phil@hands.com> | 2015-06-04 08:04:59 +0100 |
|---|---|---|
| committer | Philip Hands <phil@hands.com> | 2015-06-04 10:30:24 +0100 |
| commit | 3a0a7979287ed04d1a887143ecf061ec63abee3d (patch) | |
| tree | 255b259ce8fc355d19ab584a3595a50527226b41 | |
| parent | 878a9e12073eb04530ea175ec89ece4045949515 (diff) | |
| download | jenkins.debian.net-3a0a7979287ed04d1a887143ecf061ec63abee3d.tar.xz | |
get rid of email stanza duplication
| -rwxr-xr-x | job-cfg/d-i.yaml.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py index 3322df41..ad7155e4 100755 --- a/job-cfg/d-i.yaml.py +++ b/job-cfg/d-i.yaml.py @@ -185,7 +185,7 @@ def lr(keep): def publ_email(irc=None): r = ['jenkins+' + irc] if irc != None else [] r.append('qa-jenkins-scm@lists.alioth.debian.org') - return [{'email': {'recipients': ' '.join(r)}}] + return {'email': {'recipients': ' '.join(r)}} def publ(fmt=None,trigger=False,irc=None): @@ -196,7 +196,7 @@ def publ(fmt=None,trigger=False,irc=None): {'logparser': {'parse-rules': '/srv/jenkins/logparse/debian-installer.rules', 'unstable-on-warning': 'true', 'fail-on-error': 'true'}}]) - p.extend(publ_email(irc=irc)) + p.append(publ_email(irc=irc)) if fmt != None: p.append({'archive': {'artifacts': fmt + '/**/*.*', 'latest_only': True}}) return p @@ -229,7 +229,7 @@ def jtmpl(act, target, fmt=None, po=False): def jobspec_svn(key, name, desc=None, defaults=None, - priority=120, logkeep=None, trigger=None, publisher=None, + priority=120, logkeep=None, trigger=None, publishers=None, lang=None, fmt=None, po=False, inc_regs=None ): j = {'scm': scm_svn(po=po,inc_regs=inc_regs), 'project-type': 'freestyle', @@ -239,7 +239,7 @@ def jobspec_svn(key, name, desc=None, defaults=None, + (' po2xml' if po else '')}], 'properties': prop(priority=priority), 'name': name} - j['publishers'] = publisher() if publisher != None else publ(fmt=fmt,trigger=trigger,irc='debian-boot') + j['publishers'] = publishers if publishers != None else publ(fmt=fmt,trigger=trigger,irc='debian-boot') if desc != None: j['description'] = desc() @@ -295,7 +295,7 @@ data.append(jobspec_svn(key='job-template', desc=instguide_desc, trigger=15, priority=125, - publisher=publ_email, + publishers=[publ_email()], inc_regs='{include}')) data.append( @@ -307,8 +307,7 @@ data.append( 'publishers': [{'logparser': {'parse-rules': '/srv/jenkins/logparse/debian.rules', 'unstable-on-warning': 'true', 'fail-on-error': 'true'}}, - {'email': {'recipients': 'qa-jenkins-scm@lists.alioth.debian.org'}}]}} -) + publ_email()]}}) data.append( {'job-template': { 'defaults': 'd-i', @@ -320,8 +319,7 @@ data.append( 'publishers': [{'logparser': {'parse-rules': '/srv/jenkins/logparse/debian.rules', 'unstable-on-warning': 'true', 'fail-on-error': 'true'}}, - {'email': {'recipients': 'jenkins+debian-boot qa-jenkins-scm@lists.alioth.debian.org'}}]}} -) + publ_email('debian-boot')]}}) data.extend( [jtmpl(act='manual',target=l,fmt=f,po=(l not in non_po_langs)) |