schroot.yaml: beat this into a form suitable for j-j-b

1 files changed, 30 insertions, 21 deletions

diff --git a/job-cfg/schroot.yaml b/job-cfg/schroot.yaml
index 4eadbb29..195104d5 100644
--- a/job-cfg/schroot.yaml
+++ b/job-cfg/schroot.yaml
@@ -1,15 +1,10 @@
 - defaults:
-        name: schroot
+        name: schroot-create
         publishers:
                 - email:
                         recipients: jenkins+debian-qa holger@layer-acht.org
         triggers:
                 - timed: '{my_time}'
-
-
-- job-template:
-        defaults: schroot
-        name: '{schroot}-create'
         description: 'schroot "{schroot}" -- creation {do_not_edit}'
         distro: 'sid'
         extra-pkgs: ''
@@ -17,9 +12,13 @@
         builders:
                 - shell: '/srv/jenkins/bin/schroot-create.sh {schroot} {distro} {extra_pkgs}'
 
-- job-template:
-        defaults: schroot
-        name: '{schroot}-upgrade'
+- defaults:
+        name: schroot-upgrade
+        publishers:
+                - email:
+                        recipients: jenkins+debian-qa holger@layer-acht.org
+        triggers:
+                - timed: '{my_time}'
         description: 'schroot "{schroot}" -- upgrade {do_not_edit}'
         distro: 'sid'
         extra-pkgs: ''
@@ -29,23 +28,33 @@
                 - shell: 'schroot -u root -c source:jenkins-{schroot} -- apt-get -y -u dist-upgrade'
                 - shell: 'schroot -u root -c source:jenkins-{schroot} -- apt-get --purge autoremove'
 
+- job-template:
+        defaults: schroot-create
+        name: '{schroot}-haskell-create'
+
+- job-template:
+        defaults: schroot-upgrade
+        name: '{schroot}-haskell-upgrade'
+
+- job-template:
+        defaults: schroot-create
+        name: '{schroot}-sid-create'
+
+- job-template:
+        defaults: schroot-upgrade
+        name: '{schroot}-sid-upgrade'
+
 - project:
-        name: haskell-schroot
-        schroot: haskell
+        name: schroot
+        do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=qa/jenkins.debian.net.git;a=blob;f=job-cfg/schroot.yaml">schroot.yaml</a>.'
         jobs:
-                - '{schroot}-create':
+                - '{name}-haskell-create':
                         extra_pkgs: 'cabal-install ghc dctrl-tools patchutils libtext-patch-perl libfile-slurp-perl  libipc-run-perl liblist-moreutils-perl libdpkg-perl'
                         my_time: '0 10 * * 1'
-                - '{schroot}-upgrade':
+                - '{name}-haskell-upgrade':
                         my_time: '0 11 * * *'
-        do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=qa/jenkins.debian.net.git;a=blob;f=job-cfg/schroot.yaml">schroot.yaml</a>.'
 
-- project:
-        name: sid-schroot
-        schroot: sid
-        jobs:
-                - '{schroot}-create':
+                - '{name}-sid-create':
                         my_time: '0 10 * * 2'
-                - '{schroot}-upgrade':
+                - '{name}-sid-upgrade':
                         my_time: '0 11 * * *'
-        do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=qa/jenkins.debian.net.git;a=blob;f=job-cfg/schroot.yaml">schroot.yaml</a>.'