[Qa-jenkins-scm] [jenkins.debian.net] 03/03: reproducible: vary number of cores between 1st and 2nd build

[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 4bdc95346259f5b88520f038669ddf398f5db46f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 23 23:12:49 2015 +0200

    reproducible: vary number of cores between 1st and 2nd build
---
 bin/reproducible_build.sh       | 2 +-
 bin/reproducible_html_graphs.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index ec16966..89872a0 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -412,7 +412,7 @@ build_rebuild() {
 		set -x
 		printf "BUILDUSERID=2222\nBUILDUSERNAME=pbuilder2\n" > $TMPCFG
 		( timeout 12h nice ionice -c 3 sudo \
-		  DEB_BUILD_OPTIONS="parallel=$NUM_CPU" \
+		  DEB_BUILD_OPTIONS="parallel=$(echo $NUM_CPU-1|bc)" \
 		  TZ="/usr/share/zoneinfo/Etc/GMT-14" \
 		  LANG="fr_CH.UTF-8" \
 		  LC_ALL="fr_CH.UTF-8" \
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index 16e9be4..5b87001 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -593,7 +593,8 @@ create_main_stats_page() {
 	write_page "<tr><td>kernel version, modified using /usr/bin/linux64 --uname-2.6</td><td>$(uname -sr)</td><td>$(/usr/bin/linux64 --uname-2.6 uname -sr)</td></tr>"
 	write_page "<tr><td>umask</td><td>0022<td>0002</td><tr>"
 	write_page "<tr><td>CPU type</td><td>$(cat /proc/cpuinfo|grep 'model name'|head -1|cut -d ":" -f2-)</td><td>same for both builds (currently, work in progress)</td></tr>"
-	write_page "<tr><td>number of cores used</td><td>$(cat /proc/cpuinfo |grep ^processor|wc -l)</td><td>(currently, work in progress)</td></tr>"
+	local NUM_CPU=$(cat /proc/cpuinfo |grep ^processor|wc -l)
+	write_page "<tr><td>number of cores used</td><td>$NUM_CPU</td><td>$(echo $NUM_CPU-1|bc)</td></tr>"
 	write_page "<tr><td>year, month, date</td><td>today ($DATE)</td><td>same for both builds (currently, work in progress)</td></tr>"
 	write_page "<tr><td>hour, minute</td><td>hour is usually the same...</td><td>the minute differs (currently, work in progress)</td></tr>"
 	write_page "</table>"

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