You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by da...@apache.org on 2017/08/17 03:37:58 UTC
[incubator-openwhisk-client-go] branch master updated: Remove the
dependency on test cases in openwhisk CLI
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-client-go.git
The following commit(s) were added to refs/heads/master by this push:
new 2117d60 Remove the dependency on test cases in openwhisk CLI
2117d60 is described below
commit 2117d605943465aa806f37eb485ecee5e46f8ccd
Author: Vincent Hou <sh...@us.ibm.com>
AuthorDate: Wed Aug 16 21:51:45 2017 -0400
Remove the dependency on test cases in openwhisk CLI
The repo should remove the dependency on test cases in openwhisk cli.
---
.travis.yml | 2 --
tools/travis/test_openwhisk.sh | 33 ++-------------------------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 00d88c4..c57dd18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,6 @@ matrix:
sudo: required
go: 1.7
services: docker
- - os: osx
- go: 1.7
git:
depth: 3
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
index 4006238..3a660df 100755
--- a/tools/travis/test_openwhisk.sh
+++ b/tools/travis/test_openwhisk.sh
@@ -9,17 +9,13 @@ cd $HOMEDIR
# Clone the OpenWhisk code
git clone --depth 3 https://github.com/apache/incubator-openwhisk.git
-# Clone the OpenWhisk CLI code
-git clone --depth 3 https://github.com/apache/incubator-openwhisk-cli.git
-
# Build script for Travis-CI.
WHISKDIR="$HOMEDIR/incubator-openwhisk"
-OPENWHISK_CLI_BUILD_DIR="$HOMEDIR/incubator-openwhisk-cli"
cd $WHISKDIR
./tools/travis/setup.sh
-ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing"
+ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=openwhisk"
cd $WHISKDIR/ansible
$ANSIBLE_CMD setup.yml
@@ -27,30 +23,5 @@ $ANSIBLE_CMD prereq.yml
$ANSIBLE_CMD couchdb.yml
$ANSIBLE_CMD initdb.yml
$ANSIBLE_CMD apigateway.yml
-
-cd $WHISKDIR
-GRADLE_PROJS_SKIP="-x :core:pythonAction:distDocker -x :core:python2Action:distDocker -x :core:swift3Action:distDocker -x :core:javaAction:distDocker"
-TERM=dumb ./gradlew distDocker -PdockerImagePrefix=testing $GRADLE_PROJS_SKIP
-
-cd $WHISKDIR/ansible
$ANSIBLE_CMD wipe.yml
-$ANSIBLE_CMD openwhisk.yml
-
-# Install the dependencies for openwhisk cli and build the binary based on the current changes.
-cd $OPENWHISK_CLI_BUILD_DIR
-go get -d -t ./...
-go build -ldflags "-X main.CLI_BUILD_TIME=`date -u '+%Y-%m-%dT%H:%M:%S%:z'`" -o wsk
-
-# Copy the binary generated into the OPENWHISK_HOME/bin, so that the test cases will run based on it.
-mkdir -p $WHISKDIR/bin
-cp $OPENWHISK_CLI_BUILD_DIR/wsk $WHISKDIR/bin
-
-# Run the test cases under openwhisk to ensure the quality of the binary.
-cd $OPENWHISK_CLI_BUILD_DIR
-./gradlew :tests:test -Dtest.single=Wsk*Tests*
-sleep 30
-./gradlew tests:test -Dtest.single=*ApiGwRoutemgmtActionTests*
-sleep 30
-./gradlew tests:test -Dtest.single=*ApiGwTests*
-sleep 30
-./gradlew tests:test -Dtest.single=*ApiGwEndToEndTests*
+$ANSIBLE_CMD openwhisk.yml -e '{"openwhisk_cli":{"installation_mode":"remote","remote":{"name":"OpenWhisk_CLI","dest_name":"OpenWhisk_CLI","location":"https://github.com/apache/incubator-openwhisk-cli/releases/download/latest"}}}'
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].