[incubator-openwhisk-package-deploy] branch master updated: env variable instead of param for installCatalog (#8)

[dubeejw]

This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-deploy.git


The following commit(s) were added to refs/heads/master by this push:
     new ece847f  env variable instead of param for installCatalog (#8)
ece847f is described below

commit ece847f342cea8e741bd2cc241cb31d31b2afa5b
Author: Belinda Vennam <beemari...@gmail.com>
AuthorDate: Mon Jan 8 09:22:02 2018 -0500

    env variable instead of param for installCatalog (#8)
    
    * env variable instead of param for installCatalog
    
    * remove skip deploy param
    
    * updating skip_deploy to true
---
 packages/installCatalog.sh | 16 +++++-----------
 tools/travis/build.sh      |  4 ++--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/installCatalog.sh b/packages/installCatalog.sh
index ae1ca14..098a0ff 100755
--- a/packages/installCatalog.sh
+++ b/packages/installCatalog.sh
@@ -13,25 +13,19 @@ set -x
 
 if [ $# -eq 0 ]
   then
-  echo "Usage: ./installCatalog.sh <authkey> <edgehost> <pathtowskcli> 
<skipdeploy> <docker>"
+  echo "Usage: ./installCatalog.sh <authkey> <edgehost> <pathtowskcli> 
<docker>"
 fi
 
 AUTH="$1"
 EDGE_HOST="$2"
 WSK_CLI="$3"
-SKIP_DEPLOY="${4:-False}"
-DOCKER="$5"
+DOCKER="$4"
+SKIP_DEPLOY="${SKIP_DEPLOY:-True}"
 
 # If docker is not provided, set to default version.
-if [ -z "$5" ]
-  then
-  if [ $SKIP_DEPLOY = False ] || [ $SKIP_DEPLOY = True ]
+if [ -z "$4" ]
   then
     DOCKER="openwhisk/wskdeploy:0.8.10"
-  else
-    SKIP_DEPLOY=False
-    DOCKER=$4
-  fi
 fi
 
 # If the auth key file exists, read the key in the file. Otherwise, take the
@@ -44,7 +38,7 @@ PACKAGE_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd 
)"
 
 export WSK_CONFIG_FILE= # override local property file to avoid namespace 
clashes
 
-#clone all Blueprints
+# clone all Blueprints
 for bp in blueprint-hello-world blueprint-cloudant-trigger 
blueprint-messagehub-trigger
 do
   if [ -e actions/blueprints/$bp ]
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 9b1b61b..19f6208 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -37,6 +37,7 @@ $ANSIBLE_CMD openwhisk.yml
 
 # Set Environment
 export OPENWHISK_HOME=$WHISKDIR
+export SKIP_DEPLOY="True"
 
 cd $WHISKDIR
 
@@ -50,12 +51,11 @@ cat whisk.properties
 WSK_CLI=$WHISKDIR/bin/wsk
 AUTH_KEY=$(cat $WHISKDIR/ansible/files/auth.whisk.system)
 EDGE_HOST=$(grep '^edge.host=' $WHISKPROPS_FILE | cut -d'=' -f2)
-SKIP_DEPLOY="True"
 
 # Install Package
 
 cd $ROOTDIR/packages
-./installCatalog.sh $AUTH_KEY $EDGE_HOST $WSK_CLI $SKIP_DEPLOY
+./installCatalog.sh $AUTH_KEY $EDGE_HOST $WSK_CLI
 
 # Test
 cd $ROOTDIR

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].