[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: also include profitbricks 3+4+7 in munin graph overview

Holger Levsen holger at layer-acht.org
Thu Jun 15 13:41:05 UTC 2017


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 5733372ce16786f8cc51afc1482dc7392274d978
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Jun 15 15:40:56 2017 +0200

    reproducible: also include profitbricks 3+4+7 in munin graph overview
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_html_nodes_info.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/bin/reproducible_html_nodes_info.sh b/bin/reproducible_html_nodes_info.sh
index 7f7d6d0..36cb412 100755
--- a/bin/reproducible_html_nodes_info.sh
+++ b/bin/reproducible_html_nodes_info.sh
@@ -130,7 +130,7 @@ for TYPE in daily weekly ; do
 		write_page "<table>"
 		write_page "<tr><th>Name</th><th colspan='6'></th>"
 		write_page "</tr>"
-		for NODE in jenkins $BUILD_NODES ; do
+		for NODE in $REPRODUCIBLE_NODES ; do
 			if [ -z "$(echo $NODE | grep $ARCH || true)" ] && [ "$NODE" != "jenkins" ] ; then
 				continue
 			elif [ "$NODE" = "jenkins" ] && [ "$ARCH" != "amd64" ] ; then
@@ -148,17 +148,22 @@ for TYPE in daily weekly ; do
 			fi
 			write_page "<tr><td>$JENKINS_NODENAME</td>"
 			for GRAPH in jenkins_reproducible_builds cpu memory df swap load ; do
-				if [ "$JENKINS_NODENAME" = "jenkins" ] && [ "$GRAPH" = "jenkins_reproducible_builds" ] ; then
-					write_page "<td></td>"
+				if [ "$GRAPH" = "jenkins_reproducible_builds" ] ; then
+					case $JENKINS_NODENAME in
+						jenkins)	write_page "<td></td>" ; continue ;;
+						profitbricks3)	write_page "<td></td>" ; continue ;;
+						profitbricks4)	write_page "<td></td>" ; continue ;;
+						profitbricks7)	write_page "<td></td>" ; continue ;;
+						*)		;;
+					esac
+				fi
+				write_page "<td><a href='https://jenkins.debian.net/munin/debian.net/$NODE/$GRAPH.html'>"
+				if [ "$TYPE" = "daily" ] ; then
+					IMG=day.png
 				else
-					write_page "<td><a href='https://jenkins.debian.net/munin/debian.net/$NODE/$GRAPH.html'>"
-					if [ "$TYPE" = "daily" ] ; then
-						IMG=day.png
-					else
-						IMG=week.png
-					fi
-					write_page "<img src='https://jenkins.debian.net/munin/debian.net/$NODE/${GRAPH}-${IMG}' width='150' /></a></td>"
+					IMG=week.png
 				fi
+				write_page "<img src='https://jenkins.debian.net/munin/debian.net/$NODE/${GRAPH}-${IMG}' width='150' /></a></td>"
 			done
 			write_page "</tr>"
 			

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



More information about the Qa-jenkins-scm mailing list