summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2015-06-04 08:51:50 +0100
committerPhilip Hands <phil@hands.com>2015-06-04 10:30:24 +0100
commit838ae874df8bcdc3a87b33d3e4df20f8a860f743 (patch)
treed17adc2894e376ac3f38bfc5e33c992826aefd20
parent2be2d5d0c8e67f2022e44751b91cec1e148df9c7 (diff)
downloadjenkins.debian.net-838ae874df8bcdc3a87b33d3e4df20f8a860f743.tar.xz
d-i.yaml.py: def jobs() to create jobs[]
-rwxr-xr-xjob-cfg/d-i.yaml.py38
1 files changed, 19 insertions, 19 deletions
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index be6f5bfa..a49300d4 100755
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -257,6 +257,24 @@ def jobspec_svn(key, name, desc=None, defaults=None,
return { key : j }
+def jobs():
+ j = [ '{name}_maintenance',
+ '{name}_check_jenkins_jobs',
+ {'{name}_manual': {'include': ( '/trunk/manual/debian/.*\n'
+ '/trunk/manual/po/.*\n'
+ '/trunk/manual/doc/.*\n'
+ '/trunk/manual/scripts/.*' )}}]
+ j.extend(
+ [{'_'.join(['{name}','manual',l,f]): {'lang': l, 'languagename': langs[l]}}
+ for f in ['html', 'pdf']
+ for l in sorted(langs.keys())
+ if not (f=='pdf' and l in non_pdf_langs)])
+ j.extend(
+ [{'_'.join(['{name}',act,pkg]): {'gitrepo': 'git://git.debian.org/git/d-i/' + pkg}}
+ for act in ['build', 'pu-build']
+ for pkg in pkgs])
+ return j
+
data = []
data.append(
@@ -336,27 +354,9 @@ data.extend(
for act in ['build', 'pu-build']
for pkg in pkgs])
-jobs = [ '{name}_maintenance',
- '{name}_check_jenkins_jobs',
- {'{name}_manual': {'include': ( '/trunk/manual/debian/.*\n'
- '/trunk/manual/po/.*\n'
- '/trunk/manual/doc/.*\n'
- '/trunk/manual/scripts/.*' )}}]
-
-jobs.extend(
- [{'_'.join(['{name}','manual',l,f]): {'lang': l, 'languagename': langs[l]}}
- for f in ['html', 'pdf']
- for l in sorted(langs.keys())
- if not (f=='pdf' and l in non_pdf_langs)])
-
-jobs.extend(
- [{'_'.join(['{name}',act,pkg]): {'gitrepo': 'git://git.debian.org/git/d-i/' + pkg}}
- for act in ['build', 'pu-build']
- for pkg in pkgs])
-
data.append(
{'project': { 'name': 'd-i',
'do_not_edit': '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/d-i.yaml.py">d-i.yaml.py</a>.',
- 'jobs': jobs}})
+ 'jobs': jobs()}})
sys.stdout.write( dump(data, Dumper=Dumper) )