Commit 957914bd authored by Holger Levsen's avatar Holger Levsen
Browse files

djm: refactoring 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent d44b4ed7

bin/djm

+6 −6
Original line number Diff line number Diff line
@@ -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 " )

			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

					fi

					esac

				;;

			powercycle)	case $SHORTNODE in

						jenkins)	`dirname $0`/powercycle_x86_nodes.py jenkins