[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: explain some host variations 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 f1ed54f729f71d69b1ff4f3e6745e018ecf2f6ec
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Sep 9 16:34:14 2015 +0200

    reproducible: explain some host variations in dashboard
---
 TODO                       | 3 +--
 bin/reproducible_common.sh | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index 257b1c4..97d5a6d 100644
--- a/TODO
+++ b/TODO
@@ -177,8 +177,7 @@ properties:
 *** diffoscope needs to be run on the target arch...
 **** should probably be doable with qemu-static on the host
 ** setup builder3, distribute more ressources
-** dashboard: include host infos from info.sh in variation table
-** dashboard: document usage of -j 24/8/3 in write_explaination_table()
+** dashboard: correctly document usage of -j (24/8/4/2)-1 in write_explaination_table()
 ** explain status in plain english on each coreboot/openwrt/netbsd/freebsd page, also on the Debian dashboard plus add an "executive summary about reproducible builds in the free software world"
 *** get the content for "<h2>status of $1</h2>" from notes.git/friends.yaml or such
 ** repo-comparison: check for binaries without source
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index e939a4f..4c9f0cf 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -303,7 +303,7 @@ write_explaination_table() {
 	write_page "<p style=\"clear:both;\">"
 	write_page "<table class=\"main\" id=\"variation\"><tr><th>variation</th><th>first build</th><th>second build</th></tr>"
 	if [ "$1" = "debian" ] ; then
-		write_page "<tr><td>hostname</td><td>$(hostname)</td><td>i-capture-the-hostname</td></tr>"
+		write_page "<tr><td>hostname</td><td>one of: $(for i in $BUILD_NODES ; do echo $i | cut -d '.' -f1 ; done)</td><td>i-capture-the-hostname</td></tr>"
 		write_page "<tr><td>domainname</td><td>$(hostname -d)</td><td>i-capture-the-domainname</td></tr>"
 	else
 		write_page "<tr><td>hostname</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
@@ -344,7 +344,7 @@ write_explaination_table() {
 		write_page "<tr><td>umask</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td><tr>"
 	fi
 	if [ "$1" = "debian" ] ; then
-		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>CPU type</td><td>one of $(cat /srv/reproducible-results/node-information/* | grep CPU_MODEL | cut -d '=' -f2- | sort -u)</td><td>sometimes varied on armhf, same for amd64 builds (currently, work in progress)</td></tr>"
 	else
 		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</td></tr>"
 	fi

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