Skip to content

Commit

Permalink
Specify the CLI tag when install the CLI binaries from local environm…
Browse files Browse the repository at this point in the history
…ent (#359)
  • Loading branch information
violagao authored and Vincent committed Aug 18, 2018
1 parent ef1839a commit d5cf31f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tools/travis/test_openwhisk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 )"
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit d5cf31f

Please sign in to comment.