From 838ae874df8bcdc3a87b33d3e4df20f8a860f743 Mon Sep 17 00:00:00 2001
From: Philip Hands <phil@hands.com>
Date: Thu, 4 Jun 2015 08:51:50 +0100
Subject: d-i.yaml.py: def jobs() to create jobs[]

---
 job-cfg/d-i.yaml.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'job-cfg/d-i.yaml.py')

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) )
-- 
cgit v1.2.3-54-g00ecf