summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-05-23 23:12:49 +0200
committerHolger Levsen <holger@layer-acht.org>2015-05-23 23:12:49 +0200
commit4bdc95346259f5b88520f038669ddf398f5db46f (patch)
treec2e8707c0886766dce3223bb3ebd76274d3bae27
parent1787c5c3f4e84a620502a6c19b0d30a089bf7aee (diff)
downloadjenkins.debian.net-4bdc95346259f5b88520f038669ddf398f5db46f.tar.xz
reproducible: vary number of cores between 1st and 2nd build
-rwxr-xr-xbin/reproducible_build.sh2
-rwxr-xr-xbin/reproducible_html_graphs.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index ec169668..89872a0f 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 16e9be41..5b870015 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>"