reproducible debian: add 2 new armhf builder jobs and distribute jobs on odxu4

3 files changed, 25 insertions, 5 deletions

diff --git a/README b/README
index baaf6012..9e4ffef9 100644
--- a/README
+++ b/README
@@ -137,10 +137,10 @@ Installation tests inside chroot environments.
 
 * The (current) purpose of https://reproducible.debian.net is to show the prospects of reproducible builds for Debian. IOW: this is research, showing what could (and should) be done... check https://wiki.debian.org/ReproducibleBuilds for the real status of the project!
 
-* Currently, three suites are tested on amd64: 'testing', 'unstable' and 'experimental'. The tests are done using 'pbuilder' using link:https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain[our toolchain] through concurrent builder jobs, 16 for 'amd64' and 8 for 'armhf', which are each constantly testing packages and saving the results of these tests.
+* Currently, three suites are tested on amd64: 'testing', 'unstable' and 'experimental'. The tests are done using 'pbuilder' using link:https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain[our toolchain] through concurrent builder jobs, 16 for 'amd64' and 10 for 'armhf', which are each constantly testing packages and saving the results of these tests.
 
 ** These builds on remote nodes run on very different hardware: for 'amd64' we are now using four virtual machines, profitbricks-build(1+2+5+6)-amd64, which have 16 or 17 cores and 48gb ram each and are sponsored by link:https://jenkins.debian.net/userContent/thanks.html[Profitbricks].
-** To test 'armhf' we are using four small boards donated by vagrant@d.o: two quad cores (wbq0 and cbxi4pro0) with 2gb ram and two dual cores (bpi0 and hb0) with 1gb ram, each. We would love to have more or more powerful ARM hardware in the future, if you can help, please talk to us!
+** To test 'armhf' we are using four small boards donated by vagrant@d.o: three quad cores (wbq0, cbxi4pro0 and odxu4) with 2gb ram and two dual cores (bpi0 and hb0) with 1gb ram, each. We would love to have more or more powerful ARM hardware in the future, if you can help, please talk to us!
 
 * Packages to be build are scheduled in the SQLite database via a scheduler job, which runs every hour and if the queue is below a certain threshold schedules four types of packages:
 ** new untested packages (either uploaded to 'unstable' or 'experimental' or migrated to 'testing'),
diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py
index fbb78a11..6f84677f 100755
--- a/bin/reproducible_html_live_status.py
+++ b/bin/reproducible_html_live_status.py
@@ -66,7 +66,7 @@ def generate_live_status_table(arch):
     counter = 0
     for row in rows:
         counter += 1
-        # the numbers 33 and 9 should really be derived from /var/lib/jenkins/jobs/reproducible_builder_${arch}_* instead of being hard-coded here...
+        # the numbers 33 and 11 should really be derived from /var/lib/jenkins/jobs/reproducible_builder_${arch}_* instead of being hard-coded here...
         if ( arch == 'amd64' and counter == 33 ) or ( arch == 'armhf' and counter == 9 ):
              html += '<tr><td colspan="10">There are more builds marked as currently building in the database than there are ' + arch + ' build jobs. This does not compute, please investigate and fix the cause.</td></tr>'
         suite = row[1]
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 8c742ffc..b6b96b1b 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -647,6 +647,14 @@
     name: '{name}_builder_armhf_8'
 
 - job-template:
+    defaults: reproducible_builder
+    name: '{name}_builder_armhf_9'
+
+- job-template:
+    defaults: reproducible_builder
+    name: '{name}_builder_armhf_10'
+
+- job-template:
     defaults: reproducible_other_projects
     name: '{name}_coreboot'
 
@@ -1311,13 +1319,25 @@
         - '{name}_builder_armhf_7':
             my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
             my_timed: '* * * * *'
-            my_shell: '/srv/jenkins/bin/reproducible_build.sh wbq0-armhf-rb:2225 bpi0-armhf-rb:2222'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh wbq0-armhf-rb:2225 odxu4-armhf-rb:2229'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''
         - '{name}_builder_armhf_8':
             my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
             my_timed: '* * * * *'
-            my_shell: '/srv/jenkins/bin/reproducible_build.sh cbxi4pro0-armhf-rb:2226 hb0-armhf-rb:2224'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh cbxi4pro0-armhf-rb:2226 odxu4-armhf-rb:2229'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: ''
+        - '{name}_builder_armhf_9':
+            my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
+            my_timed: '* * * * *'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh odxu4-armhf-rb:2229 bpi0-armhf-rb:2222'
+            my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
+            my_node: ''
+        - '{name}_builder_armhf_10':
+            my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
+            my_timed: '* * * * *'
+            my_shell: '/srv/jenkins/bin/reproducible_build.sh odxu4-armhf-rb:2229 hb0-armhf-rb:2224'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''
         - '{name}_coreboot':