[incubator-openwhisk-cli] branch master updated: Specify the CLI tag when install the CLI binaries from local environment (#359)

[ho...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d5cf31f  Specify the CLI tag when install the CLI binaries from local environment (#359)
d5cf31f is described below

commit d5cf31fc90cfa499755d9ed118d2d9f58978617c
Author: violagao <33...@users.noreply.github.com>
AuthorDate: Sat Aug 18 17:00:07 2018 -0400

    Specify the CLI tag when install the CLI binaries from local environment (#359)
---
 .travis.yml                    | 2 +-
 tools/travis/test_openwhisk.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a07cf67..dbd03e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,7 +69,7 @@ script:
         export BUILD_VERSION=$TRAVIS_TAG;
     fi
   - ./gradlew --console=plain releaseBinaries -PpackageVersion=$BUILD_VERSION
-  - ./tools/travis/test_openwhisk.sh
+  - ./tools/travis/test_openwhisk.sh $BUILD_VERSION
 
 after_success:
   - export DEPLOY_BUILD_READY=true
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
index 4af8b03..4f472a7 100755
--- a/tools/travis/test_openwhisk.sh
+++ b/tools/travis/test_openwhisk.sh
@@ -46,6 +46,7 @@ set -e
 #  Determine default directories, etc., so we're not beholden to Travis
 #  when running tests of the script during the development cycle.
 #
+openwhisk_cli_tag=${1:-"latest"}
 scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 TRAVIS_BUILD_DIR="$( cd "${TRAVIS_BUILD_DIR:-$scriptdir/../..}" && pwd )"
@@ -93,7 +94,7 @@ $ANSIBLE_CMD couchdb.yml
 $ANSIBLE_CMD initdb.yml
 $ANSIBLE_CMD apigateway.yml
 $ANSIBLE_CMD wipe.yml
-$ANSIBLE_CMD openwhisk.yml -e cli_installation_mode=local -e openwhisk_cli_home=$TRAVIS_BUILD_DIR -e controllerProtocolForSetup=http
+$ANSIBLE_CMD openwhisk.yml -e cli_tag=$openwhisk_cli_tag -e cli_installation_mode=local -e openwhisk_cli_home=$TRAVIS_BUILD_DIR -e controllerProtocolForSetup=http
 $ANSIBLE_CMD properties.yml
 $ANSIBLE_CMD routemgmt.yml