[Git][qa/jenkins.debian.net][master] djm: refactoring

[Holger Levsen (@holger)]

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


Commits:
957914bd by Holger Levsen at 2024-11-04T13:23:35+01:00
djm: refactoring

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

- - - - -


1 changed file:

- bin/djm


Changes:

=====================================
bin/djm
=====================================
@@ -570,12 +570,12 @@ djm_do() {
 		# action
 		#
 		case $ACTION in
-			reboot)		if [ "$NODE" == "osuosl4-amd64.debian.net" ] ; then
-						echo "Skipping rebooting $NODE because josch is running something there...."
-					else
-						( ssh $NODE "sudo reboot" || xterm -T "$SHORTNODE / $ACTION failed" -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "echo -e 'ssh to $NODE failed, thus rebooting failed.\n\npress enter to continue' ; read a " )
-						run_xterm2wait4node_comeback
-					fi
+			reboot)		case $SHORTNODE in
+						osuosl4*)	echo "Skipping rebooting $NODE because josch is running something there...."
+								;;
+						*)		( ssh $NODE "sudo reboot" || xterm -T "$SHORTNODE / $ACTION failed" -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "echo -e 'ssh to $NODE failed, thus rebooting failed.\n\npress enter to continue' ; read a " )
+								run_xterm2wait4node_comeback
+					esac
 				;;
 			powercycle)	case $SHORTNODE in
 						jenkins)	`dirname $0`/powercycle_x86_nodes.py jenkins



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/957914bdcdd80c0398c41e4c126f910f3ef7885d
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/20241104/3627de04/attachment-0001.htm>