summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2017-02-17 23:13:22 +0100
committerHolger Levsen <holger@layer-acht.org>2017-02-24 13:42:17 +0100
commit38996b1ac04e8164c83c085ad5cee748cec38e0c (patch)
tree67e192c944bb65441da9a2340f6e42799ad4c189
parentc966c3cdf9fb1f9d81da24b084b1895eee501a73 (diff)
downloadjenkins.debian.net-38996b1ac04e8164c83c085ad5cee748cec38e0c.tar.xz
d-i: perhaps fix the triggering of _pdf_po2xml jobs by _html_po2xml
-rwxr-xr-xjob-cfg/d-i.yaml.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index ba4ff7b3..0625eba5 100755
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -228,10 +228,13 @@ def publ_email(irc=None):
return {'email': {'recipients': ' '.join(r)}}
-def publ(fmt=None, trigger=None, irc=None):
+def publ(fmt=None, trigger=None, irc=None, po=None):
p = []
if trigger is not None:
- p = [{'trigger': {'project': 'd-i_manual_{lang}_pdf',
+ proj = ['d-i_manual_{lang}_pdf']
+ if po:
+ proj.append(po)
+ p = [{'trigger': {'project': '_'.join(proj),
'threshold': 'UNSTABLE'}}]
p.extend([
{'logparser': {
@@ -291,7 +294,7 @@ def jobspec_svn(key, name, desc, defaults=None,
'properties': prop(priority=priority),
'name': name}
j['publishers'] = (publishers if publishers is not None
- else publ(fmt=fmt, trigger=trigger, irc='debian-boot'))
+ else publ(fmt=fmt, trigger=trigger, irc='debian-boot', po=po))
j['description'] = desc
j['description'] += ' {do_not_edit}'
@@ -355,7 +358,7 @@ for f in ['html', 'pdf']:
lang='{lang}',
fmt=f,
po=po,
- trigger=('{trg}' if not (f == 'pdf' and po == '')
+ trigger=('{trg}' if f == 'html'
else None),
desc=desc_str[f],
logkeep=90))