[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: polish graphs and include them 'roughly' in the generated page

[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 6ef6de59599499985165971c531552b2ca89b904
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Nov 29 22:48:25 2017 +0000

    reproducible Arch Linux: polish graphs and include them 'roughly' in the generated page
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/make_graph.py                             |  2 ++
 bin/reproducible_html_archlinux.sh            | 12 ++++++++++--
 userContent/reproducible/archlinux/global.css | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/bin/make_graph.py b/bin/make_graph.py
index 2a586c2..92ea2ac 100755
--- a/bin/make_graph.py
+++ b/bin/make_graph.py
@@ -32,6 +32,8 @@ def main():
     # thanks to http://tango.freedesktop.org/Generic_Icon_Theme_Guidelines for those nice colors
     if int(colors) < 6:
         r('palette(c("#73d216", "#f57900", "#cc0000", "#2e3436", "#888a85"))')
+    elif int(colors) == 6:
+        r('palette(c("#73d216", "#f57900", "#cc0000", "#2e3436", "#ffdd00", "#aaaaaa"))')
     elif int(colors) == 16:
         r('palette(c("#4e9a06", "#57a231", "#73d216", "#8ae234", \
                      "#ce5c00", "#f57900", "#fcaf3e", "#fcda27", \
diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index d8640b3..58db08e 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -221,7 +221,7 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
 	# write csv file for $REPOSITORY
 	#
 	if [ ! -f $ARCHBASE/$REPOSITORY.csv ] ; then
-		echo "# date, reproducible, unreproducible, ftbfs, depwait, 404, untested" > $ARCHBASE/$REPOSITORY.csv
+		echo '; date, reproducible, unreproducible, ftbfs, depwait, download problems, untested' > $ARCHBASE/$REPOSITORY.csv
 	fi
 	if ! grep -q $YESTERDAY $ARCHBASE/$REPOSITORY.csv ; then
 		let REAL_UNKNOWN=$TOTAL-$NR_GOOD-$NR_FTBR-$NR_FTBFS-$NR_DEPWAIT-$NR_404 || true
@@ -269,7 +269,7 @@ echo "     </tr>" >> $HTML_REPOSTATS
 # write csv file for totals
 #
 if [ ! -f $ARCHBASE/archlinux.csv ] ; then
-	echo "# date, reproducible, unreproducible, ftbfs, depwait, 404, untested" > $ARCHBASE/archlinux.csv
+	echo '; date, reproducible, unreproducible, ftbfs, depwait, download problems, untested' > $ARCHBASE/archlinux.csv
 fi
 if ! grep -q $YESTERDAY $ARCHBASE/archlinux.csv ; then
 	let ARCHLINUX_REAL_UNKNOWN=$ARCHLINUX_TOTAL-$ARCHLINUX_NR_GOOD-$ARCHLINUX_NR_FTBR-$ARCHLINUX_NR_FTBFS-$ARCHLINUX_NR_DEPWAIT-$ARCHLINUX_NR_404 || true
@@ -310,6 +310,14 @@ write_page "    <table><tr><th>repository</th><th>all source packages</th><th>re
 cat $HTML_REPOSTATS >> $PAGE
 rm $HTML_REPOSTATS > /dev/null
 write_page "    </table>"
+# include graphs
+write_page '<p style="clear:both;">'
+for REPOSITORY in $ARCHLINUX_REPOS ; do
+	write_page "<a href=\"/archlinux/$REPOSITORY.png\"><img src=\"/archlinux/$REPOSITORY.png\" class=\"overview\" alt=\"$REPOSITORY stats\"></a>"
+done
+write_page '</p><p style="clear:both;"><center>'
+write_page "<a href=\"/archlinux/archlinux.png\"><img src=\"/archlinux/archlinux.png\" alt=\"total Arch Linux stats\"></a></p>"
+# packages table header
 write_page "    <table><tr><th>repository</th><th>source package</th><th>version</th><th>test result</th><th>test date</th><th>test duration</th><th>1st build log</th><th>2nd build log</th></tr>"
 # output all HTML snipplets
 for i in UNKNOWN $(for j in $MEMBERS_404 ; do echo 404_$j ; done) $(for j in $MEMBERS_DEPWAIT ; do echo DEPWAIT_$j ; done) $(for j in $MEMBERS_FTBFS ; do echo FTBFS_$j ; done) $(for j in $MEMBERS_FTBR ; do echo FTBR_$j ; done) GOOD ; do
diff --git a/userContent/reproducible/archlinux/global.css b/userContent/reproducible/archlinux/global.css
index 58dced7..90fb5b2 100644
--- a/userContent/reproducible/archlinux/global.css
+++ b/userContent/reproducible/archlinux/global.css
@@ -92,3 +92,18 @@ table tr td {
 #variation th:first-child {
   width: 23%;
 }
+
+img {
+	vertical-align: middle;
+	max-width: 100%;
+	height: auto;
+}
+
+img.halfview {
+	max-width: 49%;
+}
+
+img.overview {
+	max-width: 24%;
+}
+

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