[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: jenkins: turn a FIXME into SAD, there's nothing we can do

[Holger Levsen]

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


Commits:
2379525f by Holger Levsen at 2020-11-19T01:05:13+01:00
jenkins: turn a FIXME into SAD, there's nothing we can do

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

- - - - -
3d2ceb6c by Holger Levsen at 2020-11-19T01:15:13+01:00
jenkins shell monitor: suppress noise when showing offline nodes

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

- - - - -


2 changed files:

- bin/abort.sh
- bin/jenkins-shell-monitor.sh


Changes:

=====================================
bin/abort.sh
=====================================
@@ -15,5 +15,5 @@ TMPFILE=$(mktemp)
 trap 'rm "$TMPFILE"' EXIT
 
 curl https://jenkins.debian.net/jnlpJars/jenkins-cli.jar -o "$TMPFILE"
-#FIXME: this is not supported anymore: https://www.jenkins.io/blog/2019/02/17/remoting-cli-removed/
+#SAD: this is not supported anymore: https://www.jenkins.io/blog/2019/02/17/remoting-cli-removed/
 java -jar "$TMPFILE" -s http://localhost:8080/ set-build-result aborted


=====================================
bin/jenkins-shell-monitor.sh
=====================================
@@ -106,7 +106,12 @@ main_loop() {
 		echo "=== jenkins/trbo shell monitor ==="
 		echo
 		echo "relevant lines from ~jenkins/offline_nodes:"
-		grep -A 2342 Also ~jenkins/offline_nodes | sed '/^$/d'
+		grep -A 2342 Also ~jenkins/offline_nodes | tac | sed -e '/# none atm/,+1d' | tac | sed '/^$/d'
+		# ^^^ this line explained:
+		# we grep for everything after the string 'Also" because we know the document and this will never change... m( :)
+		# tac is reverse cat. so doing it twice allows us to use sed backwards
+		# the first sed removes the matching line and the following (which due to tac is the previous one)
+		# the second sed command removes empty lines
 		echo
 		for j in $SEQ2 ; do
 			echo -n "#"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/faa25812ef4ce03478665f9cf2e2b4da213428a8...3d2ceb6cd2438247e701072ee8621754df63f441

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/faa25812ef4ce03478665f9cf2e2b4da213428a8...3d2ceb6cd2438247e701072ee8621754df63f441
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/20201119/ecaed766/attachment.html>