reproducible: rename builder job according initial plan

2 files changed, 22 insertions, 27 deletions

diff --git a/TODO b/TODO
index 260d93cd..bc3ecc27 100644
--- a/TODO
+++ b/TODO
@@ -243,35 +243,31 @@ properties:
 ----
 * support for arbitrary (soon to be implemented) Debian-PPAs and external repos, by just giving a source URL
 
-==== design for reproducible remote building
+==== todo for reproducible remote building
 
 * open questions:
 ** save build-host in build_duration table too? (and change to saving the time of a single build, not both combined)
 ** maintenance is general, cleanup of started but interrupted builds...
 
-* reproducible_build.sh behaviour change:
-** called without param: behave as always
-** called with the first param being "1" or "2" (and two more params, srcpkg and suite): do first or second build
-*** verify $2 and $3 are ok
-** called with two params: $node1 and $node2 where the build should happen.
-* diffoscope needs to be run on the target arch...
-
-* reproducible_build.sh (with two params) will be still always be run on the main node, that is the one holding reproducible.db, so jenkins.d.n atm
-* job definitions:
-** reproducible_build_amd64_1 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"	# 8 core machines with 32gb ram
-** reproducible_build_amd64_2 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
-** reproducible_build_amd64_3 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
-** reproducible_build_amd64_4 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
-** reproducible_build_amd64_5 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
-** reproducible_build_amd64_6 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
-** reproducible_build_amd64_7 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
-** reproducible_build_amd64_8 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
-** reproducible_build_amd64_9 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
-** reproducible_build_amd64_10 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
-** reproducible_build_armhf_1 runs "reproducible_build.sh wbq0-armhf-rb bpi0-armhf-rb"			# wbq0 and cbxi4pro0 are the quad cores
-** reproducible_build_armhf_2 runs "reproducible_build.sh wbq0-armhf-rb cbxi4pro0-armhf-rb"		# with 2gb ram and and the other two
-** reproducible_build_armhf_3 runs "reproducible_build.sh cbxi4pro0-armhf-rb hb0-armhf-rb.debian.net"	# have dual cores with 1gb ram
-** reproducible_build_armhf_4 runs "reproducible_build.sh cbxi4pro0-armhf-rb wbq0-armhf-rb"
+* reproducible_build.sh changes needed:
+** rbuild logs are not saved yet
+** verify $2 and $3 are ok
+** diffoscope needs to be run on the target arch...
+
+* missing job definitions:
+** reproducible_builder_amd64_1 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"	# 8 core machines with 32gb ram
+** 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_4 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
+** reproducible_builder_amd64_5 runs "reproducible_build.sh profitbricks-build1-amd64 profitbricks-build2-amd64"
+** reproducible_builder_amd64_6 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-amd64"
+** reproducible_builder_amd64_7 runs "reproducible_build.sh profitbricks-build2-amd64 profitbricks-build1-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"
+** reproducible_builder_armhf_2 runs "reproducible_build.sh wbq0-armhf-rb:2225 cbxi4pro0-armhf-rb:2226"		# with 2gb ram and and the other two
+** reproducible_builder_armhf_3 runs "reproducible_build.sh cbxi4pro0-armhf-rb:2226 hb0-armhf-rb.debian.net:2224"	# have dual cores with 1gb ram
+** reproducible_builder_armhf_4 runs "reproducible_build.sh cbxi4pro0-armhf-rb:2226 wbq0-armhf-rb:2225"
 
 * 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, but each run is triggered by a single job running on the main node (jenkins atm), so the results can be captured in /srv/reproducible-results/node-information/$NODE and then eg be used by reproducible_html_dashboard.sh to create the table with the differences between 1st and 2nd build...
@@ -279,7 +275,6 @@ properties:
 
 ==== reproducible Debian armhf
 
-* then: armhf building - run the job on jenkins.d.n and build1 on one host and build2 on another and then run debbindiff on jenkins.d.n…
 * monitor their temperatures via munin via ssh:
 ** http://munin-monitoring.org/wiki/Native_ssh
 ** http://guide.munin-monitoring.org/en/latest/example/transport/ssh.html
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 96c3d521..c59d6598 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -422,7 +422,7 @@
 
 - job-template:
     defaults: reproducible_builder
-    name: '{name}_builder_armhf1'
+    name: '{name}_builder_armhf_1'
 
 - job-template:
     defaults: reproducible_other_projects
@@ -834,7 +834,7 @@
             my_shell: '/srv/jenkins/bin/reproducible_build.sh'
             my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
             my_node: ''
-        - '{name}_builder_armhf1':
+        - '{name}_builder_armhf_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 wbq0-armhf-rb:2225 bpi0-armhf-rb:2222'