[Qa-jenkins-scm] [jenkins.debian.net] 03/03: reproducible: correctly display number of cores used in dashboard

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit bff970b0c95f7c6fe6f97a37465e55737150c2d1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jan 4 16:25:59 2016 +0100

    reproducible: correctly display number of cores used in dashboard
---
 TODO                       | 1 -
 bin/reproducible_common.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/TODO b/TODO
index 53eef31..a81cf38 100644
--- a/TODO
+++ b/TODO
@@ -142,7 +142,6 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 
 * higher prio:
 ** FIXME: use same footer for .sh and .py pages…
-** dashboard: number of cores used is wrong for amd64…
 ** check that build nodes have different amount of cores, so we dont need to run the 2nd build with NUM_CPU-1
 ** pkg pages
 *** new table in pkg/test history page: schedule - if that package is currently scheduled
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 4eb1dd7..fc15b86 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -391,7 +391,7 @@ write_explaination_table() {
 		write_page "<tr><td>env USER</td><td>USER=\"pbuilder1\"</td><td>USER=\"pbuilder2\"</td></tr>"
 		write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
 		write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
-		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />  XXX for amd64: 16 or 8<br />  XXX for armhf: 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />  YYY for amd64: XXX-1<br />  YYY for armhf: 2 or 4 - the opposite of the first build)</td></tr>"
+		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />  XXX for amd64: 18 or 17<br />  XXX for armhf: 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />  YYY for amd64: 17 or 18 (!= the first build)<br />  YYY for armhf: 1 or 3</td></tr>"
 		write_page "<tr><td>UTS namespace</td><td><em>shared with the host</em></td><td><em>modified using</em> /usr/bin/unshare --uts</td></tr>"
 	else
 		write_page "<tr><td>env USER</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git