reproducible arch: build job should trigger html, not vice versa

1 files changed, 32 insertions, 17 deletions

diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 48b30de0..79ceb8cb 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -34,8 +34,11 @@
     node: '{my_node}'
 
 - defaults:
-    name: reproducible_triggered
+    name: reproducible_git
     project-type: freestyle
+    triggers:
+      - timed: '{my_timed}'
+      - pollscm: '*/6 * * * *'
     properties:
       - sidebar:
           url: https://jenkins.debian.net/userContent/about.html
@@ -52,7 +55,7 @@
     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 <a href="https://reproducible.debian.net/">https://reproducible.debian.net</a>.'
     logrotate:
       daysToKeep: 90
-      numToKeep: 30
+      numToKeep: 20
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
     builders:
@@ -64,16 +67,18 @@
           fail-on-error: 'true'
       - email:
           recipients: '{my_recipients}'
-      - trigger:
-          project: '{my_trigger}'
+    scm:
+      - git:
+          url: '{my_gitrepo}'
+          branches:
+            - master
     node: '{my_node}'
 
 - defaults:
-    name: reproducible_git
+    name: reproducible_builder
     project-type: freestyle
     triggers:
       - timed: '{my_timed}'
-      - pollscm: '*/6 * * * *'
     properties:
       - sidebar:
           url: https://jenkins.debian.net/userContent/about.html
@@ -87,10 +92,22 @@
           url: http://www.profitbricks.co.uk
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
+      - priority:
+          job-prio: '150'
+      - throttle:
+          max-total: 58
+          max-per-node: 58
+          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 <a href="https://reproducible.debian.net/">https://reproducible.debian.net</a>.'
+    wrappers:
+      - timeout:
+          timeout: 1560
     logrotate:
-      daysToKeep: 90
-      numToKeep: 20
+      daysToKeep: 4
+      numToKeep: 400
       artifactDaysToKeep: -1
       artifactNumToKeep: -1
     builders:
@@ -102,15 +119,11 @@
           fail-on-error: 'true'
       - email:
           recipients: '{my_recipients}'
-    scm:
-      - git:
-          url: '{my_gitrepo}'
-          branches:
-            - master
+          notify-every-unstable-build: false
     node: '{my_node}'
 
 - defaults:
-    name: reproducible_builder
+    name: reproducible_builder_trigger
     project-type: freestyle
     triggers:
       - timed: '{my_timed}'
@@ -155,6 +168,8 @@
       - email:
           recipients: '{my_recipients}'
           notify-every-unstable-build: false
+      - trigger:
+          project: '{my_trigger}'
     node: '{my_node}'
 
 - defaults:
@@ -640,11 +655,11 @@
     name: '{name}_setup_schroot_arch'
 
 - job-template:
-    defaults: reproducible_builder
+    defaults: reproducible_builder_trigger
     name: '{name}_builder_arch_1'
 
 - job-template:
-    defaults: reproducible_triggered
+    defaults: reproducible
     name: '{name}_html_archlinux'
 
 - project:
@@ -1304,13 +1319,13 @@
         - '{name}_builder_arch_1':
             my_description: 'Try to reproducibly build an Archlinux package.'
             my_timed: '* * * * *'
+            my_trigger: 'reproducible_builder_arch_1'
             my_shell: '/srv/jenkins/bin/reproducible_build_arch_pkg.sh'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''
         - '{name}_html_archlinux':
             my_description: 'Build a simple webpage for Archlinux reproducibility tests'
             my_timed: ''
-            my_trigger: 'reproducible_builder_arch_1'
             my_shell: '/srv/jenkins/bin/reproducible_html_archlinux.sh'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''