[ARVADOS-DEV] updated: 27d5f6ed785b6e127cf9a2f1145fac21627a9a89

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-deploy.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  27d5f6ed785b6e127cf9a2f1145fac21627a9a89 (commit)
      from  cd13ebefd14bc536d069f395bc866e902550ffff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 27d5f6ed785b6e127cf9a2f1145fac21627a9a89
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Nov 18 16:31:54 2014 -0500

    Do not blow up when another puppet process is already running during deploy.
    
    No issue #

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index a55678b..599dff3 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -148,11 +148,12 @@ if [[ "$COMPRESSED_NODE_LIST" != '' ]]; then
   SUM_ECODE=0
   for node in $COMPUTE_NODES; do
     echo "Updating $node.$IDENTIFIER"
-    ssh -p2222  -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node.$IDENTIFIER -C "/usr/bin/puppet agent -t"
+    RESULT=`ssh -p2222  -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node.$IDENTIFIER -C "/usr/bin/puppet agent -t"`
     ECODE=$?
-    if [[ "$ECODE" != "255" && "$ECODE" != "2" && "$ECODE" != "0"  ]]; then
+    if [[ "$ECODE" != "255" && ! ("$RESULT" =~ 'already in progress') && "$ECODE" != "2" && "$ECODE" != "0"  ]]; then
       # 255 -> connection timed out. Just ignore that, it's possible the compute node was being shut down.
       # Puppet exits '2' if there are changes. For real!
+      # Puppet prints 'Notice: Run of Puppet configuration client already in progress' if another puppet process was already running
       SUM_ECODE=$(($SUM_ECODE + $ECODE))
       echo "ERROR updating $node.$IDENTIFIER: exit code $ECODE"
     fi

-----------------------------------------------------------------------


hooks/post-receive
--