[Qa-jenkins-scm] [jenkins.debian.net] 05/05: resistance is futile

[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 ec80501e8ab6597e6b787ed71e0f8d3a2556f608
Author: Philip Hands <phil at hands.com>
Date:   Sun Dec 13 13:12:50 2015 +0100

    resistance is futile
---
 job-cfg/reproducible.yaml | 80 +++++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 52 deletions(-)

diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 48cf5ec..d3f759a 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -325,12 +325,36 @@
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: '{my_hname}'
 
-        - '{name}_setup_schroot_unstable_diffoscope_amd64_jenkins':
-            my_description: 'Setup schroot for running diffoscope in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)'
-            my_timed: '42 0 * * *'
-            my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all'
+        - '{name}_{my_task}_{my_arch}_{my_hname}':
+            # FIXME: should define my_dstro an paramaterise the rest, but that will probably change job names, so let's leave it for now -- fil
+            my_task:
+                - 'setup_schroot_unstable__diffoscope':
+                    my_description: 'Setup schroot for running diffoscope in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)'
+                    my_timed: '42 0 * * *'
+                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all'
+                - 'setup_schroot_testing_diffoscope':
+                    my_description: 'Setup schroot for running diffoscope in a testing environment (this is needed to be able to correctly investigate haskell binaries...)'
+                    my_timed: '23 0 * * *'
+                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing-diffoscope testing diffoscope locales-all'
+                - 'setup_schroot_unstable':
+                    my_description: 'Setup unstable schroot for fetching source packages for the builder jobs.'
+                    my_timed: '42 1 * * *'
+                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable botch'
+                - 'setup_schroot_testing':
+                    my_description: 'Setup testing schroot for fetching source packages for the builder jobs.'
+                    my_timed: '42 1 * * *'
+                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing testing'
+                - 'setup_schroot_experimental':
+                    my_description: 'Setup experimental schroot for fetching source packages for the builder jobs.'
+                    my_timed: '33 1 * * *'
+                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-experimental experimental'
+
+            my_hname:
+                - 'jenkins':
+                    my_arch: 'armhf'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: ''
+
         - '{name}_setup_schroot_unstable_diffoscope_amd64_profitbricks3':
             my_description: 'Setup schroot for running diffoscope in a unstable environment'
             my_timed: '42 0 * * *'
@@ -338,34 +362,6 @@
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: '{my_hname}'
             my_hname: 'profitbricks3'
-        - '{name}_setup_schroot_testing_diffoscope_amd64_jenkins':
-            my_description: 'Setup schroot for running diffoscope in a testing environment (this is needed to be able to correctly investigate haskell binaries...)'
-            my_timed: '23 0 * * *'
-            my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing-diffoscope testing diffoscope locales-all'
-            my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
-            my_node: '{my_hname}'
-            my_hname: ''
-        - '{name}_setup_schroot_unstable_amd64_jenkins':
-            my_description: 'Setup unstable schroot for fetching source packages for the builder jobs.'
-            my_timed: '42 1 * * *'
-            my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable botch'
-            my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
-            my_node: '{my_hname}'
-            my_hname: ''
-        - '{name}_setup_schroot_testing_amd64_jenkins':
-            my_description: 'Setup testing schroot for fetching source packages for the builder jobs.'
-            my_timed: '42 1 * * *'
-            my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing testing'
-            my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
-            my_node: '{my_hname}'
-            my_hname: ''
-        - '{name}_setup_schroot_experimental_amd64_jenkins':
-            my_description: 'Setup experimental schroot for fetching source packages for the builder jobs.'
-            my_timed: '33 1 * * *'
-            my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-experimental experimental'
-            my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
-            my_node: '{my_hname}'
-            my_hname: ''
         - '{name}_scheduler':
             my_description: 'Schedule packages to be tested for reproducibility.'
             my_timed: '10 * * * *'
@@ -636,30 +632,10 @@
 # =-=-=-= old style stuff =-=-=-=
 - job-template:
     defaults: reproducible
-    name: '{name}_setup_schroot_unstable_diffoscope_amd64_jenkins'
-
-- job-template:
-    defaults: reproducible
     name: '{name}_setup_schroot_unstable_diffoscope_amd64_profitbricks3'
 
 - job-template:
     defaults: reproducible
-    name: '{name}_setup_schroot_testing_diffoscope_amd64_jenkins'
-
-- job-template:
-    defaults: reproducible
-    name: '{name}_setup_schroot_unstable_amd64_jenkins'
-
-- job-template:
-    defaults: reproducible
-    name: '{name}_setup_schroot_testing_amd64_jenkins'
-
-- job-template:
-    defaults: reproducible
-    name: '{name}_setup_schroot_experimental_amd64_jenkins'
-
-- job-template:
-    defaults: reproducible
     name: '{name}_scheduler'
 
 - job-template:

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