[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: show link to maintenance jobs for offline nodes

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
416c60f4 by Holger Levsen at 2019-04-08T09:23:57Z
reproducible Debian: show link to maintenance jobs for offline nodes

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
2639e5ef by Holger Levsen at 2019-04-08T09:29:22Z
reproducible Debian: fix bug: correctly show nodes automatically made offline as such

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_html_nodes_info.sh


Changes:

=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -92,21 +92,20 @@ build_nodes_health_page() {
 			URL="https://jenkins.debian.net/view/reproducible/view/Node_maintenance/job/reproducible_node_health_check_${ARCH}_${JENKINS_NODENAME}"
 			BADGE="$URL/badge/icon"
 			write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
+			# maintenance
+			URL="https://jenkins.debian.net/view/reproducible/view/Node_maintenance/job/reproducible_maintenance_${ARCH}_${JENKINS_NODENAME}"
+			BADGE="$URL/badge/icon"
+			write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
 			# mark offline nodes
 			JENKINS_OFFLINE_GIT_LIST=~jenkins-adm/jenkins.debian.net/jenkins-home/offline_nodes
-			if [ -f "$JENKINS_OFFLINE_GIT_LIST" ] && grep -q "$NODE" "$JENKINS_OFFLINE_GIT_LIST" \
-			 && ( [ -f "$JENKINS_OFFLINE_LIST" ] && ! grep -q "$NODE" "$JENKINS_OFFLINE_LIST" ) ; then
-				write_page '</td><td colspan="10" style="text-align: center;"><span style="font-style: italic;">temporarily marked offline by jenkins</span></td>'
+			if [ -f "$JENKINS_OFFLINE_GIT_LIST" ] && ! grep -q "$NODE" "$JENKINS_OFFLINE_GIT_LIST" \
+			 && ( [ -f "$JENKINS_OFFLINE_LIST" ] && grep -q "$NODE" "$JENKINS_OFFLINE_LIST" ) ; then
+				write_page '</td><td colspan="9" style="text-align: center;"><span style="font-style: italic;">temporarily marked offline by jenkins</span></td>'
 				continue
-
 			elif [ -f "$JENKINS_OFFLINE_LIST" ] && grep -q "$NODE" "$JENKINS_OFFLINE_LIST"; then
-				write_page '</td><td colspan="10" style="text-align: center;"><span style="font-style: italic;">offline</span></td>'
+				write_page '</td><td colspan="9" style="text-align: center;"><span style="font-style: italic;">offline</span></td>'
 				continue
 			fi
-			# maintenance
-			URL="https://jenkins.debian.net/view/reproducible/view/Node_maintenance/job/reproducible_maintenance_${ARCH}_${JENKINS_NODENAME}"
-			BADGE="$URL/badge/icon"
-			write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
 			# worker.log links
 			case $JENKINS_NODENAME in
 				jenkins)	write_page "<td></td>" ;;



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/413d585a7c8e20ce99a5cbc7316558dddd23dc9b...2639e5eff48992466afbe0228e33af58e9b122e6

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/413d585a7c8e20ce99a5cbc7316558dddd23dc9b...2639e5eff48992466afbe0228e33af58e9b122e6
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190408/684596bc/attachment-0001.html>