Skip to content

Commit d5cf31f

Browse files
violagaoVincent
authored andcommitted
Specify the CLI tag when install the CLI binaries from local environment (#359)
1 parent ef1839a commit d5cf31f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ script:
6969
export BUILD_VERSION=$TRAVIS_TAG;
7070
fi
7171
- ./gradlew --console=plain releaseBinaries -PpackageVersion=$BUILD_VERSION
72-
- ./tools/travis/test_openwhisk.sh
72+
- ./tools/travis/test_openwhisk.sh $BUILD_VERSION
7373

7474
after_success:
7575
- export DEPLOY_BUILD_READY=true

tools/travis/test_openwhisk.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ set -e
4646
# Determine default directories, etc., so we're not beholden to Travis
4747
# when running tests of the script during the development cycle.
4848
#
49+
openwhisk_cli_tag=${1:-"latest"}
4950
scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5051

5152
TRAVIS_BUILD_DIR="$( cd "${TRAVIS_BUILD_DIR:-$scriptdir/../..}" && pwd )"
@@ -93,7 +94,7 @@ $ANSIBLE_CMD couchdb.yml
9394
$ANSIBLE_CMD initdb.yml
9495
$ANSIBLE_CMD apigateway.yml
9596
$ANSIBLE_CMD wipe.yml
96-
$ANSIBLE_CMD openwhisk.yml -e cli_installation_mode=local -e openwhisk_cli_home=$TRAVIS_BUILD_DIR -e controllerProtocolForSetup=http
97+
$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
9798
$ANSIBLE_CMD properties.yml
9899
$ANSIBLE_CMD routemgmt.yml
99100

0 commit comments

Comments
 (0)