[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: have two nodes health graph pages: daily and weekly
Holger Levsen
holger at layer-acht.org
Mon Jun 12 18:28:32 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 fce81b15443a9387e85649229850e8a0916b4d5a
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Jun 12 20:28:01 2017 +0200
reproducible Debian: have two nodes health graph pages: daily and weekly
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
bin/reproducible_nodes_info.sh | 91 ++++++++++++----------
.../reproducible/main_navigation.mustache | 17 ++--
2 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/bin/reproducible_nodes_info.sh b/bin/reproducible_nodes_info.sh
index 1878a8d..133319a 100755
--- a/bin/reproducible_nodes_info.sh
+++ b/bin/reproducible_nodes_info.sh
@@ -97,53 +97,60 @@ write_page "</p>"
write_page_footer
publish_page debian
-VIEW=nodes_graphs
-PAGE=index_${VIEW}.html
-ARCH=amd64
-SUITE=unstable
-echo "$(date -u) - starting to write $PAGE page."
-write_page_header $VIEW "Build nodes health graphs"
-write_page "<p>This page is still under development. Please provide feedback, which other information (be it from munin or elsewhere) should be displayed and how this page should be split further, eg, the graphs could all be on another page and/or we should split this page into four for the four architectures being tested…</p>"
-# FIXME: Also either $0 and its job needs to be renamed to include 'html' or the code needs to be moved elsewhere
-write_page "<p style=\"clear:both;\">"
-for ARCH in ${ARCHS} ; do
- write_page "<h3>$ARCH nodes</h3>"
- write_page "<table>"
- write_page "<tr><th>Name</th><th colspan='6'></th>"
- write_page "</tr>"
- for NODE in jenkins $BUILD_NODES ; do
- if [ -z "$(echo $NODE | grep $ARCH || true)" ] && [ "$NODE" != "jenkins" ] ; then
- continue
- elif [ "$NODE" = "jenkins" ] && [ "$ARCH" != "amd64" ] ; then
- continue
- fi
- if [ "$NODE" = "jenkins" ] ; then
- JENKINS_NODENAME=jenkins
- NODE="jenkins.debian.net"
- else
- case $ARCH in
- amd64|i386) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-build##' ) ;;
- arm64) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-sled##' ) ;;
- armhf) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;
- esac
- 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>"
+for TYPE in daily weekly ; do
+ VIEW=nodes_${TYPE}_graphs
+ PAGE=index_${VIEW}.html
+ ARCH=amd64
+ SUITE=unstable
+ echo "$(date -u) - starting to write $PAGE page."
+ write_page_header $VIEW "Build nodes $TYPE graphs"
+ write_page "<p>This page is still under development. Please provide feedback, which other information (be it from munin or elsewhere) should be displayed and how this page should be split further, eg, the graphs could all be on another page and/or we should split this page into four for the four architectures being tested…</p>"
+ # FIXME: Also either $0 and its job needs to be renamed to include 'html' or the code needs to be moved elsewhere
+ write_page "<p style=\"clear:both;\">"
+ for ARCH in ${ARCHS} ; do
+ write_page "<h3>$ARCH nodes</h3>"
+ write_page "<table>"
+ write_page "<tr><th>Name</th><th colspan='6'></th>"
+ write_page "</tr>"
+ for NODE in jenkins $BUILD_NODES ; do
+ if [ -z "$(echo $NODE | grep $ARCH || true)" ] && [ "$NODE" != "jenkins" ] ; then
+ continue
+ elif [ "$NODE" = "jenkins" ] && [ "$ARCH" != "amd64" ] ; then
+ continue
+ fi
+ if [ "$NODE" = "jenkins" ] ; then
+ JENKINS_NODENAME=jenkins
+ NODE="jenkins.debian.net"
else
- write_page "<td><a href='https://jenkins.debian.net/munin/debian.net/$NODE/$GRAPH.html'>"
- write_page "<img src='https://jenkins.debian.net/munin/debian.net/$NODE/$GRAPH-week.png' width='150' /></a></td>"
+ case $ARCH in
+ amd64|i386) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-build##' ) ;;
+ arm64) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1-2|sed 's#-sled##' ) ;;
+ armhf) JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;
+ esac
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>"
+ 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>"
+ fi
+ done
+ write_page "</tr>"
+
done
- write_page "</tr>"
-
+ write_page "</table>"
done
- write_page "</table>"
+ write_page "</p>"
+ write_page_footer
+ publish_page debian
done
-write_page "</p>"
-write_page_footer
-publish_page debian
#
# collect node information
diff --git a/mustache-templates/reproducible/main_navigation.mustache b/mustache-templates/reproducible/main_navigation.mustache
index d94a7cd..82909de 100644
--- a/mustache-templates/reproducible/main_navigation.mustache
+++ b/mustache-templates/reproducible/main_navigation.mustache
@@ -174,12 +174,17 @@
<li {{#performance}}class='active'{{/performance}}>
<a href="/debian/index_performance.html">Performance stats</a>
</li>
- <li {{#nodes_health}}class='active'{{/nodes_health}}>
- <a href="/debian/index_nodes_health.html">Nodes health overview</a>
- </li>
- <li {{#nodes_graphs}}class='active'{{/nodes_graphs}}>
- <a href="/debian/index_nodes_graphs.html">Nodes health graphs</a>
- </li>
+ <li><ul>Nodes health
+ <li {{#nodes_health}}class='active'{{/nodes_health}}>
+ <a href="/debian/index_nodes_health.html">overview</a>
+ </li>
+ <li {{#nodes_daily_graphs}}class='active'{{/nodes_daily_graphs}}>
+ <a href="/debian/index_nodes_daily_graphs.html">daily graphs</a>
+ </li>
+ <li {{#nodes_weekly_graphs}}class='active'{{/nodes_weekly_graphs}}>
+ <a href="/debian/index_nodes_weekly_graphs.html">weekly graphs</a>
+ </li>
+ </ul></li>
</ul></li>
</ul>
{{{project_links_html}}}
--
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