summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-09 16:34:14 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-09 16:34:14 +0200
commitf1ed54f729f71d69b1ff4f3e6745e018ecf2f6ec (patch)
treec311f2829b0377ef9db78787c5dd63c17c58c45b
parent8b4e8c709ce69883c3874b97b063de21da9de3d2 (diff)
downloadjenkins.debian.net-f1ed54f729f71d69b1ff4f3e6745e018ecf2f6ec.tar.xz
reproducible: explain some host variations in dashboard
-rw-r--r--TODO3
-rwxr-xr-xbin/reproducible_common.sh4
2 files changed, 3 insertions, 4 deletions
diff --git a/TODO b/TODO
index 257b1c4d..97d5a6d4 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 e939a4fc..4c9f0cfc 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