[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] add meaningful comment for everyone

[Holger Levsen]

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


Commits:
04cb3e61 by Holger Levsen at 2018-08-23T21:37:02Z
add meaningful comment for everyone

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

- - - - -


2 changed files:

- authorized_keys/vagrant at debian.org.pub
- deploy_jdn


Changes:

=====================================
authorized_keys/vagrant at debian.org.pub
=====================================
--- a/authorized_keys/vagrant at debian.org.pub
+++ b/authorized_keys/vagrant at debian.org.pub
@@ -1,3 +1,3 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbf5z74UWxZpk7GIdxGDgEEcdQQQVn1JRoWZeiVUR9l g
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbf5z74UWxZpk7GIdxGDgEEcdQQQVn1JRoWZeiVUR9l g / vagrant
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWUh1Ua1Mrb0VHskx5/DWZos149NIeo3+dxbYKUOdOV vagrant
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC9ZtHGZ5hyWps+S8N+v6PBsyaL61+Rj1OOUYralbodiURn0mrrx0rlsTxCmm2OfxF+EiQ9PQHu0JFXLvskAPQ5CvEm0cmhpoMg+M73/Vl7vnbcWnTYzfPXgZxF7EvYbReb6QTZR5addTQWEw2Fqo9H9aCIEnYrFQS8R9J8Z1E9NdCdcT/uwbSzH0Djo529Jf0awfaTlu7SGQFNi2C2UZSxFqitA33PRkEvm8e4Inj+TjObOCsa/bY668tSwYsCVnMSa7HSKXB1Rj329d2VnfdWYcGkRydN38pjCbhEn/thC9CDHw1uKXjqm7EhUrV9bFyKRnkS6DoyOeNqBAMHt1Wb1HEgYEf4sY090tH4QUiYoi50k8k9ANvZUnsGiA68Gu9xk56G9KpewTyU4Wuu7KQy8BKOXlN/GXcCFNsxhbwI/YK1pqMgLWZELMswxuLL4PHOUaa/7Eonji3iw59bm+nDVNd5/GCH8rnnHfHvSZcw/8wp73qxUmBBIT5s3i/sGoUzhWHxIjmB0+dVAgm1bNocd5j4HZAKl+dn5qITZjDkhwi5vzbzX62m98bVSSJU5qSLnAFL6bJT5TYTKD1uj2+Fw/L+Y7Rdskj7v9QX55RVsx7MCzAtrTNuxEBPEA1XJw6RSjtW8D2MCjSaV8bJKXQaH62YYtIeHGm4m5Lc/stSbw== Vagrant Cascadian <vagrant at aikidev.net>


=====================================
deploy_jdn
=====================================
--- a/deploy_jdn
+++ b/deploy_jdn
@@ -222,7 +222,10 @@ for i in "${HOSTS[@]}" ; do
 done
 echo
 
-JENKINS_OFFLINE_LIST="$(basename $0)/jenkins-home/offline_nodes"
+JENKINS_OFFLINE_LIST="$(dirname $0)/jenkins-home/offline_nodes"
+echo
+echo $JENKINS_OFFLINE_LIST
+echo
 OFFLINE=""
 PROBLEMS=""
 for i in "${HOSTS[@]}" ; do
@@ -239,18 +242,23 @@ for i in "${HOSTS[@]}" ; do
 		rm $LOG.$i $LOG.$i.done > /dev/null
 	else
 		echo "Problems on $i: $TAIL"
+		KNOWN_OFFLINE=false
 		if [ -f "$JENKINS_OFFLINE_LIST" ]; then
 			if grep -q "$i" "$JENKINS_OFFLINE_LIST"; then
+				KNOWN_OFFLINE=true
 				if [ -z "$OFFLINE" ] ; then
 					OFFLINE=" $i"
 				else
 					OFFLINE=" $i\n$OFFLINE"
 				fi
 			fi
-		elif [ -z "$PROBLEMS" ] ; then
-			PROBLEMS=" $i"
-		else
-			PROBLEMS=" $i\n$PROBLEMS"
+		fi
+		if ! $KNOWN_OFFLINE ; then
+			if [ -z "$PROBLEMS" ] ; then
+				PROBLEMS=" $i"
+			else
+				PROBLEMS=" $i\n$PROBLEMS"
+			fi
 		fi
 		get_arch_color $i
 		xterm -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "less +G $LOG.$i ; rm $LOG.$i $LOG.$i.done" &



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/04cb3e61ee9b817384ee41cacdbee094737bd384

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/04cb3e61ee9b817384ee41cacdbee094737bd384
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/20180823/a658d270/attachment-0001.html>