[Qa-jenkins-scm] [jenkins.debian.net] 02/10: back out recent changes, to see is we can get things working with 1.2.0

[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 29a7db8fbe67b50cc57133b37ea68f480d90ce7b
Author: Philip Hands <phil at hands.com>
Date:   Mon Jun 8 22:24:29 2015 +0100

    back out recent changes, to see is we can get things working with 1.2.0
---
 job-cfg/d-i.yaml.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index e5f6642..d78d6ef 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) )

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