[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: deploy_jdn: refactor for more intuitive control flow

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
f89b8d88 by Mattia Rizzolo at 2020-05-30T17:12:01+02:00
deploy_jdn: refactor for more intuitive control flow

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
df936410 by Mattia Rizzolo at 2020-05-30T17:13:10+02:00
deploy_jdn: don't de-fact duplicate the list of problematic hosts

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- deploy_jdn


Changes:

=====================================
deploy_jdn
=====================================
@@ -231,32 +231,32 @@ for i in "${HOSTS[@]}" ; do
 	elif [[ "$TAIL" =~ "__$HNAME1=ok__" ]] || [[ "$TAIL" =~ "__$HNAME2=ok__" ]] || [[ "$TAIL" =~ "__reallyreally=ok__" ]] || [[ "$TAIL" =~ "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." ]] || [ ! -f $LOG.$i ] ; then
 		rm $LOG.$i $LOG.$i.done > /dev/null
 	else
-		echo "Problems on $i: $TAIL"
-		KNOWN_OFFLINE=false
 		if [ -f "$JENKINS_OFFLINE_LIST" ]; then
 			if grep -q "$i" "$JENKINS_OFFLINE_LIST"; then
-				KNOWN_OFFLINE=true
+				# node was known to be offline
 				if [ -z "$OFFLINE" ] ; then
 					OFFLINE=" $i ($LOG.$i)"
 				else
 					OFFLINE=" $i ($LOG.$i)\n$OFFLINE"
 				fi
-			fi
-		fi
-		if ! $KNOWN_OFFLINE ; then
-			if [ -z "$PROBLEMS" ] ; then
-				PROBLEMS=" $i"
 			else
-				PROBLEMS=" $i\n$PROBLEMS"
+				# unexpected problem
+				if [ -z "$PROBLEMS" ] ; then
+					PROBLEMS=" $i"
+				else
+					PROBLEMS=" $i\n$PROBLEMS"
+				fi
+				get_arch_color $i
+				xterm -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "less +G $LOG.$i ; rm $LOG.$i $LOG.$i.done" &
 			fi
-			get_arch_color $i
-			xterm -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "less +G $LOG.$i ; rm $LOG.$i $LOG.$i.done" &
 		fi
 	fi
 done
 echo
+echo
 
 echo "$(echo "${HOSTS[@]}" | sed -s "s# #\n#g" | wc -l) hosts updated."
+echo
 if [ ! -z "$PROBLEMS" ] ; then
 	echo "Problems on:"
 	echo -e "$PROBLEMS"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/38479bc3850c25dd31089b08098b6bf0adcc6530...df936410f13d6d661d0d04713094020f640bedc4

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/38479bc3850c25dd31089b08098b6bf0adcc6530...df936410f13d6d661d0d04713094020f640bedc4
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/20200530/091f3710/attachment-0001.html>