reproducible: disable setup job until helmut says sid is unbroken again ;)

1 files changed, 35 insertions, 26 deletions

diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 2f5e4fe1..c2d8ea55 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -3,7 +3,6 @@
     triggers:
       - timed: "{my_timed}"
     project-type: freestyle
-    concurrent: True
     properties:
       - sidebar:
           url: https://jenkins.debian.net/userContent/about.html
@@ -17,15 +16,6 @@
           url: http://www.profitbricks.com
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
-      - priority:
-          job-prio: '150'
-      - throttle:
-          max-total: 3
-          max-per-node: 3
-          enabled: True
-          option: category
-          categories:
-            - reproducible
     description: '{my_description}<br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/reproducible.yaml">reproducible.yaml</a>.<br>Results are available at the <a href="https://jenkins.debian.net/userContent/reproducible.html">reproducible builds statistics</a> page.'
     logrotate:
       daysToKeep: 365
@@ -33,21 +23,17 @@
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
     builders:
-      - shell: '{my_shell} {my_params}'
+      - shell: '{my_shell}'
     publishers:
       - email:
           recipients: 'jenkins+debian-reproducible holger@layer-acht.org'
-          notify-every-unstable-build: False
-      - logparser:
-          parse-rules: '/srv/jenkins/logparse/reproducible.rules'
-          unstable-on-warning: 'true'
-          fail-on-error: 'true'
 
 - defaults:
-    name: reproducible_setup
+    name: reproducible_builder
     triggers:
       - timed: "{my_timed}"
     project-type: freestyle
+    concurrent: True
     properties:
       - sidebar:
           url: https://jenkins.debian.net/userContent/about.html
@@ -61,6 +47,15 @@
           url: http://www.profitbricks.com
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
+      - priority:
+          job-prio: '150'
+      - throttle:
+          max-total: 3
+          max-per-node: 3
+          enabled: True
+          option: category
+          categories:
+            - reproducible
     description: '{my_description}<br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/reproducible.yaml">reproducible.yaml</a>.<br>Results are available at the <a href="https://jenkins.debian.net/userContent/reproducible.html">reproducible builds statistics</a> page.'
     logrotate:
       daysToKeep: 365
@@ -68,13 +63,15 @@
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
     builders:
-      - shell: '{my_shell}'
+      - shell: '{my_shell} {my_params}'
     publishers:
       - email:
           recipients: 'jenkins+debian-reproducible holger@layer-acht.org'
-      - trigger:
-          project: 'reproducible_stats'
-          threshold: 'UNSTABLE'
+          notify-every-unstable-build: False
+      - logparser:
+          parse-rules: '/srv/jenkins/logparse/reproducible.rules'
+          unstable-on-warning: 'true'
+          fail-on-error: 'true'
 
 - defaults:
     name: reproducible_stats
@@ -110,9 +107,12 @@
           directory: '.'
           indexfiles: 'index.html'
           keepall: True
+#      - trigger:
+#          project: 'reproducible_stats'
+#          threshold: 'UNSTABLE'
 
 - job-template:
-    defaults: reproducible_setup
+    defaults: reproducible
     name: '{name}_setup'
 
 - job-template:
@@ -120,23 +120,28 @@
     name: '{name}_stats'
 
 - job-template:
-    defaults: reproducible
+    defaults: reproducible_builder
     name: '{name}_build_random_packages'
 
 - job-template:
-    defaults: reproducible
+    defaults: reproducible_builder
     name: '{name}_build_new_versions'
 
 - job-template:
-    defaults: reproducible
+    defaults: reproducible_builder
     name: '{name}_build_candidates'
 
+- job-template:
+    defaults: reproducible
+    name: '{name}_scheduler'
+
 - project:
     name: reproducible
     jobs:
         - '{name}_setup':
             my_description: 'Setup pbuilder for reproducible builds as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
-            my_timed: '42 0 * * *'
+            my_timed: ''
+#            my_timed: '42 0 * * *'
             my_shell: '/srv/jenkins/bin/reproducible_setup.sh'
         - '{name}_stats':
             my_description: 'Reproducible builds statistics'
@@ -157,4 +162,8 @@
             my_timed: '0 0,4,8,12,16,20 * * *'
             my_shell: '/srv/jenkins/bin/reproducible_build.sh'
             my_params: 'candidates 20'
+        - '{name}_scheduler':
+            my_description: 'Schedule packages to be tested on reproducible building.'
+            my_timed: '23 * * * *'
+            my_shell: '/srv/jenkins/bin/reproducible_scheduler.sh'