[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] deploy_jdn: fixup

[Mattia Rizzolo]

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


Commits:
46a5ad0d by Mattia Rizzolo at 2018-04-12T19:18:51+02:00
deploy_jdn: fixup

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

- - - - -


1 changed file:

- deploy_jdn


Changes:

=====================================
deploy_jdn
=====================================
--- a/deploy_jdn
+++ b/deploy_jdn
@@ -89,7 +89,7 @@ ALL_HOSTS=$HOSTS
 
 node_in_the_future () {
 	case "$1" in
-		profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386) true ;;
+		profitbricks-build4-amd64*|profitbricks-build5-amd64*|profitbricks-build6-i386*|profitbricks-build15-amd64*|profitbricks-build16-i386*) true ;;
 		codethink-sled9*|codethink-sled11*|codethink-sled13*|codethink-sled15*) true ;;
 		*) false ;;
 	esac
@@ -179,7 +179,7 @@ for i in $HOSTS ; do
 	if [ -z "$real_command" ]; then
 		if node_in_the_future "$i"; then GITOPTS="-c http.sslVerify=false" ; fi
 		# real command, for running manually: cd ~jenkins-adm/jenkins.debian.net/ ; sudo -u jenkins-adm git pull ; ./update_jdn.sh
-		read -r -d '' real_command <<-EOF
+		read -r -d '' remote_command <<-EOF
 			set -e
 			export LANG=C
 			cd ~jenkins-adm
@@ -196,15 +196,14 @@ for i in $HOSTS ; do
 	fi
 
 	echo -n "."
-	command="$real_command"
 	if $reset_clock ; then
 		if node_in_the_future "$i" ; then
 			#  set correct future date
-			command="sudo ntpdate -b de.pool.ntp.org && $real_command && sudo date --set=\"+398 days +6 hours + 23 minutes\" && echo '__$(echo $i|cut -d '.' -f1)=ok__'"
+			remote_command="sudo ntpdate -b de.pool.ntp.org && $remote_command && sudo date --set=\"+398 days +6 hours + 23 minutes\" && echo '__$(echo $i|cut -d '.' -f1)=ok__'"
 		fi
 	fi
 	get_arch_color $i
-	xterm -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "ssh -o 'BatchMode = yes' -t $i '$command' | tee $LOG.$i ; sleep 2 ; touch $LOG.$i.done" &
+	xterm -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "ssh -o 'BatchMode = yes' -t $i '$remote_command' | tee $LOG.$i ; sleep 2 ; touch $LOG.$i.done" &
 done
 sleep 3
 COUNTER=0



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/46a5ad0dcf9d3d624b9ba55cf7980effb2ace074

---
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/46a5ad0dcf9d3d624b9ba55cf7980effb2ace074
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/qa-jenkins-scm/attachments/20180412/5e7fc075/attachment-0001.html>