Fix the test that avoids running puppet multiple times on installations
authorWard Vandewege <ward@curoverse.com>
Fri, 25 Sep 2015 16:05:33 +0000 (12:05 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 25 Sep 2015 16:05:33 +0000 (12:05 -0400)
where workbench runs on the API server.

No issue #

jenkins/run-deploy.sh

index d2c12eefb49dafdd4407d31ac7347dc5a9369406..06680a001b67c1ef05c98b3aa0654509b476ae3b 100755 (executable)
@@ -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))