reproducible: remove two amd64 build jobs on jenkins and add six more on the new nodes

2 files changed, 46 insertions, 14 deletions

diff --git a/TODO b/TODO
index c0715fd4..bc59578b 100644
--- a/TODO
+++ b/TODO
@@ -240,14 +240,6 @@ properties:
 ** diffoscope needs to be run on the target arch...
 *** can't this be run via qemu on the host?
 
-* missing job definitions:
-** reproducible_builder_amd64_1 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
-** reproducible_builder_amd64_2 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
-** reproducible_builder_amd64_3 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
-** reproducible_builder_amd64_8 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
-** reproducible_builder_amd64_9 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
-** reproducible_builder_amd64_10 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
-
 * then we have a new script, reproducible_info.sh which just outputs key-value pairs, like "ARCH=armhf", DATETIME="Mo 10. Aug 11:56:22 CEST 2015" and "TZ=UTC" and whatever.
 ** this script is run on all nodes, via a for loop on the main node (jenkins atm), as part of dashboard.sh, and the results will be captured in /srv/reproducible-results/node-information/$NODE and then used by reproducible_html_dashboard.sh to create the table with the differences between 1st and 2nd build...
 *** document usage of -j 24/8/3 in write_explaination_table()
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 594d6a36..dd9a94a7 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -374,11 +374,15 @@
 
 - job-template:
     defaults: reproducible_builder
-    name: '{name}_builder_epsilon'
+    name: '{name}_builder_amd64_1'
 
 - job-template:
     defaults: reproducible_builder
-    name: '{name}_builder_zeta'
+    name: '{name}_builder_amd64_2'
+
+- job-template:
+    defaults: reproducible_builder
+    name: '{name}_builder_amd64_3'
 
 - job-template:
     defaults: reproducible_builder
@@ -398,6 +402,18 @@
 
 - job-template:
     defaults: reproducible_builder
+    name: '{name}_builder_amd64_8'
+
+- job-template:
+    defaults: reproducible_builder
+    name: '{name}_builder_amd64_9'
+
+- job-template:
+    defaults: reproducible_builder
+    name: '{name}_builder_amd64_10'
+
+- job-template:
+    defaults: reproducible_builder
     name: '{name}_builder_armhf_1'
 
 - job-template:
@@ -754,16 +770,22 @@
             my_shell: '/srv/jenkins/bin/reproducible_build.sh'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''
-        - '{name}_builder_epsilon':
+        - '{name}_builder_amd64_1':
             my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
             my_timed: 'H/2 * * * *'
-            my_shell: '/srv/jenkins/bin/reproducible_build.sh'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''
-        - '{name}_builder_zeta':
+        - '{name}_builder_amd64_2':
             my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
             my_timed: 'H/2 * * * *'
-            my_shell: '/srv/jenkins/bin/reproducible_build.sh'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: ''
+        - '{name}_builder_amd64_3':
+            my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
+            my_timed: 'H/2 * * * *'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''
         - '{name}_builder_amd64_4':
@@ -790,6 +812,24 @@
             my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''
+        - '{name}_builder_amd64_8':
+            my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
+            my_timed: 'H/2 * * * *'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: ''
+        - '{name}_builder_amd64_9':
+            my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
+            my_timed: 'H/2 * * * *'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: ''
+        - '{name}_builder_amd64_10':
+            my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
+            my_timed: 'H/2 * * * *'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: ''
         - '{name}_builder_armhf_1':
             my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
             my_timed: 'H/2 * * * *'