reproducible Debian: add 8 new builder jobs for i386

Signed-off-by: Holger Levsen <holger@layer-acht.org>

2 files changed, 24 insertions, 16 deletions

diff --git a/README b/README
index 7c0bb693..51b33275 100644
--- a/README
+++ b/README
@@ -135,11 +135,11 @@ Installation tests inside chroot environments.
 
 * The (current) purpose of https://tests.reproducible-builds.org is to show the potential of reproducible builds for Debian - and six other projects currently. This is research, showing what could (and should) be done... check https://wiki.debian.org/ReproducibleBuilds for the real status of the project for Debian!
 
-* Currently, three suites are tested on 'amd64', 'i386' and 'armhf' architectures: 'testing', 'unstable' and 'experimental'. The tests are done using 'pbuilder' using link:https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain[our toolchain] through concurrent builder jobs, 32 for 'amd64', 16 for 'i386' and 60 for 'armhf', which are each constantly testing packages and saving the results of these tests.
+* Currently, three suites are tested on 'amd64', 'i386' and 'armhf' architectures: 'testing', 'unstable' and 'experimental'. The tests are done using 'pbuilder' using link:https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain[our toolchain] through concurrent builder jobs, 32 for 'amd64', 24 for 'i386' and 60 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 using four virtual machines, profitbricks-build(1+5+11+15)-amd64, which have 15 or 16 cores and 48gb ram each. These nodes are sponsored by link:https://jenkins.debian.net/userContent/thanks.html[Profitbricks].
-** for 'i386' we are also using four virtual machines, profitbricks-build(2+6+12+16)-i386, which have 10 or 9 cores and 36gb ram each. pb2+12 run AMD Opteron CPUs, pb6+16 Intel Xeon CPUs. These nodes are also sponsored by link:https://jenkins.debian.net/userContent/thanks.html[Profitbricks].
+** for 'i386' we are also using four virtual machines, profitbricks-build(2+6+12+16)-i386, which have 10 or 9 cores and 36gb ram each. pb2+12 run emulated AMD Opteron CPUs and pb6+16 Intel Xeon CPUs. These nodes are also sponsored by link:https://jenkins.debian.net/userContent/thanks.html[Profitbricks].
 ** To test 'armhf' we are using 22 small boards donated by vagrant@d.o:
 *** five quad-cores (cbxi4a, cbxi4b, and ff4a) with 4gb ram,
 *** three octo-cores (odxu4, odxu4b and odxu4c) with 2gb ram,
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index cef212d1..8bd75398 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -609,22 +609,30 @@
             my_description: 'Try to reproducibly build a scheduled package. This is one of several builder jobs.'
             my_arch: 'i386'
             my_num:
-                -  '1': &bd_amd_2_6 { my_node1: 'profitbricks-build2', my_node2: 'profitbricks-build6' }
-                -  '2': &bd_amd_6_2 { my_node1: 'profitbricks-build6', my_node2: 'profitbricks-build2' }
-                -  '3': *bd_amd_2_6
-                -  '4': *bd_amd_6_2
-                -  '5': *bd_amd_2_6
-                -  '6': *bd_amd_6_2
-                -  '7': *bd_amd_2_6
-                -  '8': *bd_amd_6_2
+                -  '1': &bd_amd_2_6   { my_node1: 'profitbricks-build2',  my_node2: 'profitbricks-build6'  }
+                -  '2': &bd_amd_6_2   { my_node1: 'profitbricks-build6',  my_node2: 'profitbricks-build2'  }
+                -  '3': &bd_amd_2_16  { my_node1: 'profitbricks-build2',  my_node2: 'profitbricks-build16' }
+                -  '4': &bd_amd_16_2  { my_node1: 'profitbricks-build16', my_node2: 'profitbricks-build2'  }
+                -  '5': &bd_amd_12_6  { my_node1: 'profitbricks-build12', my_node2: 'profitbricks-build6'  }
+                -  '6': &bd_amd_6_12  { my_node1: 'profitbricks-build6',  my_node2: 'profitbricks-build12' }
+                -  '7': &bd_amd_12_16 { my_node1: 'profitbricks-build12', my_node2: 'profitbricks-build16' }
+                -  '8': &bd_amd_16_12 { my_node1: 'profitbricks-build16', my_node2: 'profitbricks-build12' }
                 -  '9': *bd_amd_2_6
                 - '10': *bd_amd_6_2
-                - '11': *bd_amd_2_6
-                - '12': *bd_amd_6_2
-                - '13': *bd_amd_2_6
-                - '14': *bd_amd_6_2
-                - '15': *bd_amd_2_6
-                - '16': *bd_amd_6_2
+                - '11': *bd_amd_2_16
+                - '12': *bd_amd_16_2
+                - '13': *bd_amd_12_6
+                - '14': *bd_amd_6_12
+                - '15': *bd_amd_12_16
+                - '16': *bd_amd_16_12
+                - '17': *bd_amd_2_6
+                - '18': *bd_amd_6_2
+                - '19': *bd_amd_2_16
+                - '20': *bd_amd_16_2
+                - '21': *bd_amd_12_6
+                - '22': *bd_amd_6_12
+                - '23': *bd_amd_12_16
+                - '24': *bd_amd_16_12
             my_shell: '/srv/jenkins/bin/reproducible_build.sh {my_node1}-{my_arch} {my_node2}-{my_arch}'
             my_timed: '* * * * *'
             my_hname: ''