[ARVADOS-DEV] updated: 25ada289bea32adcbaee5a5181eb94809693ec9c

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  25ada289bea32adcbaee5a5181eb94809693ec9c (commit)
      from  9819eac0a0ec331264e58864e66682ae9d436e82 (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 25ada289bea32adcbaee5a5181eb94809693ec9c
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Sep 25 12:05:33 2015 -0400

    Fix the test that avoids running puppet multiple times on installations
    where workbench runs on the API server.
    
    No issue #

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index d2c12ee..06680a0 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -210,7 +210,7 @@ KEEP_NODES=`ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TO
 
 title "Updating workbench"
 SUM_ECODE=0
-if [[ `host workbench.$ARVADOS_API_HOST` != `host $ARVADOS_API_HOST` ]]; then
+if [[ `host workbench.$ARVADOS_API_HOST |cut -f4 -d' '` != `host $ARVADOS_API_HOST |cut -f4 -d' '` ]]; then
   # Workbench runs on a separate host. We need to run puppet there too.
   run_puppet workbench.$IDENTIFIER ECODE
   SUM_ECODE=$(($SUM_ECODE + $ECODE))

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


hooks/post-receive
--