openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From daisy...@apache.org
Subject [incubator-openwhisk-wskdeploy] branch master updated: Pull the openwhisk images instead of building them in Travis
Date Thu, 17 Aug 2017 03:36:48 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new d338720  Pull the openwhisk images instead of building them in Travis
d338720 is described below

commit d338720ec50b429cb0f754daafa4a59ea5e7dafb
Author: Vincent Hou <shou@us.ibm.com>
AuthorDate: Thu Aug 10 13:30:01 2017 -0400

    Pull the openwhisk images instead of building them in Travis
---
 tools/travis/install_openwhisk.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/travis/install_openwhisk.sh b/tools/travis/install_openwhisk.sh
index 21d9aa4..c7590e7 100755
--- a/tools/travis/install_openwhisk.sh
+++ b/tools/travis/install_openwhisk.sh
@@ -12,7 +12,7 @@ WHISKDIR="$HOMEDIR/openwhisk"
 cd $WHISKDIR
 ./tools/travis/setup.sh
 
-ANSIBLE_CMD="ansible-playbook -i environments/local"
+ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=openwhisk"
 
 cd $WHISKDIR/ansible
 $ANSIBLE_CMD setup.yml
@@ -21,7 +21,9 @@ $ANSIBLE_CMD couchdb.yml
 $ANSIBLE_CMD initdb.yml
 
 cd $WHISKDIR
-./gradlew distDocker
+# The CLI build is only used to facilitate the openwhisk deployment. When CLI is separate
from openwhisk, this line
+# should be removed.
+./gradlew :tools:cli:distDocker -PdockerImagePrefix=openwhisk
 
 cd $WHISKDIR/ansible
 $ANSIBLE_CMD wipe.yml

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

Mime
View raw message