Commit a22841d0 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Debian: show offline nodes as offline on nodes health overview page 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 1e91c278

bin/reproducible_common.sh

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ ARCHS="amd64 i386 arm64 armhf" 
# define Debian build nodes in use

. /srv/jenkins/bin/jenkins_node_definitions.sh

MAINNODE="jenkins" # used by reproducible_maintenance.sh only

JENKINS_OFFLINE_LIST="/var/lib/jenkins/offline_nodes"



# variables on the nodes we are interested in

BUILD_ENV_VARS="ARCH NUM_CPU CPU_MODEL DATETIME KERNEL" # these also needs to be defined in bin/reproducible_info.sh

bin/reproducible_html_nodes_info.sh

+11 −2
Original line number Diff line number Diff line 
#!/bin/bash

# vim: set noexpandtab:



# Copyright © 2015-2016 Holger Levsen <holger@layer-acht.org>

# Copyright © 2015-2018 Holger Levsen <holger@layer-acht.org>

#           ©      2018 Mattia Rizzolo <mattia@debian.org>

# released under the GPLv=2
@@ -46,6 +46,7 @@ for ARCH in ${ARCHS} ; do 
	# Debian Reproducible Builds node network but are using for reproducible builds

	# tests of other projects…

	REPRODUCIBLE_NODES="jenkins"



	for NODE in $BUILD_NODES ; do

		REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES $NODE"

		if [ "$NODE" = "profitbricks-build2-i386.debian.net" ] ; then
@@ -68,7 +69,15 @@ for ARCH in ${ARCHS} ; do 
				armhf) 		JENKINS_NODENAME=$(echo $NODE | cut -d "-" -f1) ;;

			esac

		fi

		write_page "<tr><td>$JENKINS_NODENAME</td>"

		write_page "<tr><td>$JENKINS_NODENAME"

		# mark offline nodes

		if [ -f "$JENKINS_OFFLINE_LIST" ]; then

			if grep -q "$NODE" "$JENKINS_OFFLINE_LIST"; then

				write_page " is offline</td><td colspan=\"11\"></td>"

				continue

			fi

		fi

		write_page "</td>"

		# health check

		URL="https://jenkins.debian.net/view/reproducible/view/Node_maintenance/job/reproducible_node_health_check_${ARCH}_${JENKINS_NODENAME}"

		BADGE="$URL/badge/icon"

bin/reproducible_worker.sh

+1 −2
Original line number Diff line number Diff line 
#!/bin/bash

# vim: set noexpandtab:



# Copyright © 2017 Holger Levsen (holger@layer-acht.org)

# Copyright © 2017-2018 Holger Levsen (holger@layer-acht.org)

#           © 2018 Mattia Rizolo <mattia@debian.org>

# released under the GPLv=2
@@ -57,7 +57,6 @@ while true ; do 
		echo "The lockfile $LOCKFILE is present, thus stopping this"

		break

	fi

	JENKINS_OFFLINE_LIST="/var/lib/jenkins/offline_nodes"

	if [ -f "$JENKINS_OFFLINE_LIST" ]; then

		for n in "$NODE1" "$NODE2"; do

			if grep -q "$n" "$JENKINS_OFFLINE_LIST"; then