[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: fix a bug (not recognizing offline nodes) in _worker.sh…

[Holger Levsen]

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


Commits:
8cf7c66f by Holger Levsen at 2018-12-22T12:29:49Z
reproducible Debian: fix a bug (not recognizing offline nodes) in _worker.sh which was migated by robustness in _build.sh

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

- - - - -


2 changed files:

- bin/reproducible_worker.sh
- jenkins-home/offline_nodes


Changes:

=====================================
bin/reproducible_worker.sh
=====================================
@@ -30,8 +30,7 @@ notify_log_of_failure() {
 		END
 }
 
-# endless loop
-while true ; do
+main_loop() {
 	#
 	# check if we really should be running
 	#
@@ -60,8 +59,9 @@ while true ; do
 	if [ -f "$JENKINS_OFFLINE_LIST" ]; then
 		for n in "$NODE1" "$NODE2"; do
 			if grep -q "$n" "$JENKINS_OFFLINE_LIST"; then
-				echo "$n is currently marked as offline, stopping the worker."
-				break
+				echo "$n is currently marked as offline, sleeping an hour before trying again."
+				sleep 60.1337m
+				exit
 			fi
 		done
 	fi
@@ -102,5 +102,10 @@ while true ; do
 	echo
 
 	[ "$RETCODE" -eq 0 ] || notify_log_of_failure
+}
 
+# main
+while true ; do
+	main_loop
 done
+


=====================================
jenkins-home/offline_nodes
=====================================
@@ -2,16 +2,11 @@
 # No builds will be dispatched to those nodes, and the nodes will be marked
 # as offline in the jenkins UI.
 
-# FIXME: the latter is needed by start-agent.sh, the former probably elsewhere
-# FIXME: do debug (only the former should be enough, after all
-# FIXME )grep -q example-armhf-rb` should trigger on the former line as well)
-#example-armhf-rb.debian.net
 #example-armhf-rb
-ff4a-armhf-rb.debian.net
-ff4a
-ff64a-armhf-rb.debian.net
-ff64a
-jtx1c-armhf-rb.debian.net
-jtx1c
-p64b-armhf-rb.debian.net
-p64b
+#codethink-sled16-arm64
+#profitbricks-build16-i386
+#
+ff4a-armhf-rb
+ff64a-armhf-rb
+jtx1c-armhf-rb
+p64b-armhf-rb



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/8cf7c66f7d951e930dc760ab98ea009d1f5db37e

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/8cf7c66f7d951e930dc760ab98ea009d1f5db37e
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/20181222/d7704cae/attachment-0001.html>