This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-composer.git
The following commit(s) were added to refs/heads/master by this push:
new e78a9ab Skip OpenWhisk build in Travis (#10)
e78a9ab is described below
commit e78a9ab0da98e5e58c76b055f0b6e59c124a2cf9
Author: Olivier Tardieu <[email protected]>
AuthorDate: Mon Nov 26 15:34:23 2018 -0500
Skip OpenWhisk build in Travis (#10)
---
travis/setup.sh | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/travis/setup.sh b/travis/setup.sh
index 2ee033d..17ebb48 100755
--- a/travis/setup.sh
+++ b/travis/setup.sh
@@ -23,26 +23,21 @@ set -e
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
ROOTDIR="$SCRIPTDIR/.."
-IMAGE_PREFIX="composer"
WHISKDIR="$ROOTDIR/openwhisk"
-# OpenWhisk stuff
+# Clone OpenWhisk
cd $ROOTDIR
git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk
-cd openwhisk
-./tools/travis/setup.sh
-cp $SCRIPTDIR/runtimes.json $WHISKDIR/ansible/files
+# Install Ansible
+pip install --user ansible==2.5.2
-# Pull down images
-docker pull openwhisk/controller
-docker tag openwhisk/controller ${IMAGE_PREFIX}/controller
-docker pull openwhisk/invoker
-docker tag openwhisk/invoker ${IMAGE_PREFIX}/invoker
+# Configure runtimes
+cp $SCRIPTDIR/runtimes.json $WHISKDIR/ansible/files
# Deploy OpenWhisk
cd $WHISKDIR/ansible
-ANSIBLE_CMD="ansible-playbook -i ${WHISKDIR}/ansible/environments/local -e
docker_image_prefix=${IMAGE_PREFIX}"
+ANSIBLE_CMD="ansible-playbook -i ${WHISKDIR}/ansible/environments/local -e
docker_image_prefix=openwhisk"
$ANSIBLE_CMD setup.yml
$ANSIBLE_CMD prereq.yml
$ANSIBLE_CMD couchdb.yml
@@ -50,13 +45,13 @@ $ANSIBLE_CMD initdb.yml
$ANSIBLE_CMD wipe.yml
$ANSIBLE_CMD openwhisk.yml -e cli_installation_mode=remote -e
limit_invocations_per_minute=600
+# Log configuration
docker images
docker ps
-
curl -s -k https://172.17.0.1 | jq .
curl -s -k https://172.17.0.1/api/v1 | jq .
-# Setup
+# Setup CLI
WHISK_APIHOST="172.17.0.1"
WHISK_AUTH=`cat ${WHISKDIR}/ansible/files/auth.guest`
WHISK_CLI="${WHISKDIR}/bin/wsk -i"
