[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] minor refactoring

[Holger Levsen]

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


Commits:
1acde999 by Holger Levsen at 2020-08-20T16:18:57+02:00
minor refactoring

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

- - - - -


1 changed file:

- bin/reproducible_system_health.sh


Changes:

=====================================
bin/reproducible_system_health.sh
=====================================
@@ -39,7 +39,7 @@ UNSTABLE_SUSPECTS=$(mktemp --tmpdir=$TMPDIR trbo-status-XXXXXXX)
 LOG=$(mktemp --tmpdir=$TMPDIR trbo-status-XXXXXXX)
 
 small_note() {
-	NOTE="<small>$1</small>"
+	NOTE="<small>($1)</small>"
 }
 
 prepare_log(){
@@ -137,43 +137,43 @@ for JOB_NAME in reproducible_* ; do
 		prepare_log
 		if [ "$JOB_NAME" = "reproducible_create_meta_pkg_sets" ] ; then
 			if $(grep -q " cp " $LOG) ; then
-				small_note "(outdated pkg set(s), manual intervention required)"
+				small_note "outdated pkg set(s), manual intervention required"
 			elif $(grep -q "could not download tail's latest packages file" $LOG) ; then
-				small_note "(problem with tails pkg set)"
+				small_note "problem with tails pkg set"
 			elif $(grep -q "could not download cloud-image package list" $LOG) ; then
-				small_note "(problem with cloud-image pkg set)"
+				small_note "problem with cloud-image pkg set"
 			elif $(grep -q "could not download grml's latest dpkg.selections file" $LOG) ; then
-				small_note "(problem with grml  pkg set)"
+				small_note "problem with grml pkg set"
 			elif $(grep -E -q "could not (download|determine) PureOS" $LOG) ; then
-				small_note "(problem with PureOS pkg set)"
+				small_note "problem with PureOS pkg set"
 			fi
 		# only show the most severe problem, don't aggregate them
 		elif $(grep -q "failed Squid Web Proxy Server" $LOG) ; then
-			small_note "(squid.service failed)"
+			small_note "squid.service failed"
 		elif $(grep -q "Kernel needs upgrade" $LOG) ; then
-			small_note "(reboot needed for kernel upgrade)"
+			small_note "reboot needed for kernel upgrade"
 		elif $(grep -q "Warning, more than one kernel in /boot" $LOG) ; then
-			small_note "(more than one kernel installed)"
+			small_note "more than one kernel installed"
 		elif $(grep -q "failed failed /etc/rc.local Compatibility" $LOG) ; then
-			small_note "(rc-local.service failed)"
+			small_note "rc-local.service failed"
 		elif $(grep -E -q "failed Session [0-9]+ of user jenkins" $LOG) ; then
-			small_note "(session failed for user jenkins)"
+			small_note "session failed for user jenkins"
 		elif $(grep -E -q "^Warning: processes found which should not be there and which could not be killed." $LOG) ; then
-			small_note "(unkillable unwanted processes)"
+			small_note "unkillable unwanted processes"
 		elif $(grep -q "failed failed pbuilder_build" $LOG) ; then
-			small_note "(pbuilder build scope failed)"
+			small_note "pbuilder build scope failed"
 		elif $(grep -q "failed failed Avahi mDNS/DNS-SD Stack" $LOG) ; then
-			small_note "(avahi failed)"
+			small_note "avahi failed"
 		elif $(grep -q "failed failed Rotate log files" $LOG) ; then
-			small_note "(logrotate failed)"
+			small_note "logrotate failed"
 		elif $(grep -q "Warning: Tried, but failed to delete these schroots:" $LOG) ; then
-			small_note "(failed to delete schroots)"
+			small_note "failed to delete schroots"
 		elif $(grep -q "Warning: Tried, but failed to delete these schroot sessions:" $LOG) ; then
-			small_note "(failed to delete schroot sessions)"
+			small_note "failed to delete schroot sessions"
 		elif $(grep -q "Warning: found reproducible_build.sh processes which have pid 1 as parent (and not sshd)" $LOG) ; then
-			small_note "(reproducible_build.sh zombies)"
+			small_note "reproducible_build.sh zombies"
 		elif $(grep -q "State: starting" $LOG) ; then
-			small_note "(node in starting state)"
+			small_note "node in starting state"
 		fi
 		if ! $SUSPECT ; then
 			echo "1|$JOB_NAME|$JOB_URL|true|$NOTE" >> ${UNSTABLE_JOBS}
@@ -184,24 +184,24 @@ for JOB_NAME in reproducible_* ; do
 		prepare_log
 		# only show the most severe problem, don't aggregate them
 		if $(grep -E -q "Failed to connect to [.0-9]+ port 3128: Connection refused" $LOG) ; then
-			small_note "(failed to connect to https-proxy)"
+			small_note "failed to connect to https-proxy"
 		elif $(grep -q "seems to be down, sleeping" $LOG) ; then
-			small_note "(node seemed down)"
+			small_note "node seemed down"
 		elif $(tail -1 $LOG | grep -q "Finished: ABORTED") ; then
-			small_note "(job was aborted)"
+			small_note "job was aborted"
 		elif $(grep -q "^make -r world: build failed. Please re-run" $LOG) ; then
-			small_note "(make world failed)"
+			small_note "make world failed"
 		elif $(grep -q "^ERROR: Failed to make build_install" $LOG) ; then
-			small_note "(make build_install failed)"
+			small_note "make build_install failed"
 		elif $(grep -q "^SSH EXIT CODE:" $LOG) ; then
 			if $(grep -q "^Timeout, server .*.debian.net not responding." $LOG) || \
 			 $(grep -q "^packet_write_wait: Connection to .*: Broken pipe" $LOG) ; then
-				small_note "(node stopped responding)"
+				small_note "node stopped responding"
 			else
-				small_note "(generic SSH failure)"
+				small_note "generic SSH failure"
 			fi
 		elif $(grep -q "^E: Package 'diffoscope' has no installation candidate" $LOG) ; then
-			small_note "package 'diffoscope' has no installation candidate)"
+			small_note "package 'diffoscope' has no installation candidate"
 		fi
 		case $JOB_NAME in
 			reproducible_maintenance_amd64_jenkins)			MODIFIER=250 ;; # main node



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1acde99908da8f1483f335a5f3e2f42f96874516

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1acde99908da8f1483f335a5f3e2f42f96874516
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/20200820/7aa260cc/attachment-0001.html>