From: Ward Vandewege <ward@curoverse.com>
Date: Fri, 25 Sep 2015 16:05:33 +0000 (-0400)
Subject: Fix the test that avoids running puppet multiple times on installations
X-Git-Tag: 1.1.0~1059^2~6^2~88
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/25ada289bea32adcbaee5a5181eb94809693ec9c

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 d2c12eefb4..06680a001b 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))