From 62d46d9096532293724b8e9461e8ed1d5726d490 Mon Sep 17 00:00:00 2001
From: Philip Hands <phil@hands.com>
Date: Sat, 12 Dec 2015 18:08:39 +0100
Subject: edu-packages: use yaml interpolation to dispense with .py

---
 job-cfg/edu-packages.yaml    | 52 +++++++++++++++++++++++++++++++++
 job-cfg/edu-packages.yaml.py | 68 --------------------------------------------
 2 files changed, 52 insertions(+), 68 deletions(-)
 create mode 100644 job-cfg/edu-packages.yaml
 delete mode 100755 job-cfg/edu-packages.yaml.py

diff --git a/job-cfg/edu-packages.yaml b/job-cfg/edu-packages.yaml
new file mode 100644
index 00000000..725fa51d
--- /dev/null
+++ b/job-cfg/edu-packages.yaml
@@ -0,0 +1,52 @@
+- defaults:
+    name: edu-packages
+    project-type: freestyle
+    properties:
+      - sidebar:
+          url: https://jenkins.debian.net/userContent/about.html
+          text: About jenkins.debian.net
+          icon: /userContent/images/debian-swirl-24x24.png
+      - sidebar:
+          url: https://jenkins.debian.net/view/edu_devel
+          text: Debian Edu development
+          icon: /userContent/images/debian-jenkins-24x24.png
+      - sidebar:
+          url: http://www.profitbricks.co.uk
+          text: Sponsored by Profitbricks
+          icon: /userContent/images/profitbricks-24x24.png
+    description: 'Build the master branch of git://anonscm.debian.org/debian-edu/{my_package}.git in sid on every commit.<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/edu-packages.yaml">edu-packages.yaml</a>.'
+    logrotate:
+      daysToKeep: 90
+      numToKeep: 30
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+    scm:
+      - git:
+          url: 'git://anonscm.debian.org/debian-edu/{my_package}.git'
+          branches:
+            - master
+    builders:
+      - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} debuild -b -uc -us'
+    triggers:
+      - pollscm: '*/6 * * * *'
+    publishers:
+      - email:
+          recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
+
+
+- job-template:
+    defaults: edu-packages
+    name: '{name}_{my_distro}_{my_package}'
+
+
+- project:
+    name: edu-packages
+    my_distro: 'sid'
+    my_package:
+        - 'debian-edu'
+        - 'debian-edu-archive-keyring'
+        - 'debian-edu-artwork'
+        - 'debian-edu-config'
+        - 'debian-edu-doc'
+        - 'debian-edu-install'
+    jobs: ['{name}_{my_distro}_{my_package}']
diff --git a/job-cfg/edu-packages.yaml.py b/job-cfg/edu-packages.yaml.py
deleted file mode 100755
index 35e247f6..00000000
--- a/job-cfg/edu-packages.yaml.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/python
-
-packages = """
-   debian-edu
-   debian-edu-config
-   debian-edu-install
-   debian-edu-doc
-   debian-edu-artwork
-   debian-edu-archive-keyring
-   """.split()
-
-distro="sid"
-
-print("""
-- defaults:
-    name: edu-packages
-    project-type: freestyle
-    properties:
-      - sidebar:
-          url: https://jenkins.debian.net/userContent/about.html
-          text: About jenkins.debian.net
-          icon: /userContent/images/debian-swirl-24x24.png
-      - sidebar:
-          url: https://jenkins.debian.net/view/edu_devel
-          text: Debian Edu development
-          icon: /userContent/images/debian-jenkins-24x24.png
-      - sidebar:
-          url: http://www.profitbricks.co.uk
-          text: Sponsored by Profitbricks
-          icon: /userContent/images/profitbricks-24x24.png
-    description: 'Build the master branch of git://anonscm.debian.org/debian-edu/{my_package}.git in sid on every commit.<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/edu-packages.yaml">edu-packages.yaml</a>.'
-    logrotate:
-      daysToKeep: 90
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-    scm:
-      - git:
-          url: 'git://anonscm.debian.org/debian-edu/{my_package}.git'
-          branches:
-            - master
-    builders:
-      - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} debuild -b -uc -us'
-    triggers:
-      - pollscm: '*/6 * * * *'
-    publishers:
-      - email:
-          recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
-
-""")
-
-for package in sorted(packages):
-    print("""- job-template:
-    defaults: edu-packages
-    name: '{name}_%(distro)s_%(package)s'""" %
-        dict(package=package,
-             distro=distro))
-
-print("""
-- project:
-    name: edu-packages
-    jobs:""")
-for package in sorted(packages):
-    print("""        - '{name}_%(distro)s_%(package)s':
-            my_distro: '%(distro)s'
-            my_package: '%(package)s'""" %
-              dict(package=package,
-                  distro=distro))
-- 
cgit v1.2.3-54-g00ecf