summaryrefslogtreecommitdiffstats
path: root/job-cfg
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2015-06-08 22:24:29 +0100
committerHolger Levsen <holger@layer-acht.org>2015-12-11 23:58:35 +0100
commit29a7db8fbe67b50cc57133b37ea68f480d90ce7b (patch)
tree491fd6f5fdd8ca9a3f922991e2339d24256a17d0 /job-cfg
parent9dcf6f99d3ec128aa28c272fcb1b3671f2d2eb1a (diff)
downloadjenkins.debian.net-29a7db8fbe67b50cc57133b37ea68f480d90ce7b.tar.xz
back out recent changes, to see is we can get things working with 1.2.0
Diffstat (limited to 'job-cfg')
-rwxr-xr-xjob-cfg/d-i.yaml.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index e5f66422..d78d6ef7 100755
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -284,7 +284,7 @@ def templs_jobs():
jtmpl(act=act,target=pkg),
{'_'.join(['{name}',act,pkg]): {'gitrepo': 'git://git.debian.org/git/d-i/' + pkg}}
)
- for act in ['build']
+ for act in ['build', 'pu-build']
for pkg in pkgs]]
return (templates, jobs)
@@ -360,16 +360,11 @@ data.append(
publ_email('debian-boot')]}})
(templs, jobs) = templs_jobs()
-# let's see if we can be rather more efficient with the yaml -- test just the pu stuff
-templs.append(jtmpl(act='pu-build',target='{pkg}'))
-jobs.append({'_'.join(['{name}','pu-build','{pkg}']): {'gitrepo': 'git://git.debian.org/git/d-i/{pkg}'}})
-
data.extend(templs)
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>.',
- 'pkg': pkgs,
'jobs': jobs}})
sys.stdout.write( dump(data, Dumper=Dumper) )