You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ho...@apache.org on 2017/06/23 04:04:33 UTC
[incubator-openwhisk-cli] 04/04: Remove appveyor script due to
extremely slow build
This is an automated email from the ASF dual-hosted git repository.
houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git
commit 6a8c1783e39fbb3322a6eee0483d45983ccb7c1e
Author: Vincent Hou <sh...@us.ibm.com>
AuthorDate: Thu Jun 22 14:57:17 2017 -0400
Remove appveyor script due to extremely slow build
The current appveyor script is a POC for us to prove appveyor is
a candidate to run test cases and build binaries for windows. It
does not have concrete effective script in it, but the appveyor
infrastructure is extremely slow and blocks the development. We have
to find out the reason why it is so slow and resolve before we
add the real appveyor support.
---
.appveyor.yml | 21 ----------
README.md | 6 +--
tests/src/integration/common/wskprops.go | 6 +--
tools/travis/install_openwhisk.sh | 47 ---------------------
tools/travis/test_openwhisk.sh | 70 +++++++++++++++++++++-----------
5 files changed, 52 insertions(+), 98 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index dc262e3..0000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-clone_folder: c:\gopath\src\github.com\apache\incubator-openwhisk-cli
-
-environment:
- GOPATH: c:\gopath
-
-build: off
-
-before_test:
- - go get -u github.com/golang/lint/golint
- - go get -d -t ./...
-
-install:
- - echo %PATH%
- - echo %GOPATH%
- - set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
- - go version
- - echo %PATH%
- - go env
-
-test_script:
- - echo %PATH%
\ No newline at end of file
diff --git a/README.md b/README.md
index 7b50d20..757472b 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,6 @@ To get CLI command debug information, include the -d, or --debug flag when execu
# Continuous Integration
In order to build OpenWhisk CLI binaries with good quality, OpenWhisk CLI uses Travis CI as the continuous
-delivery service for Linux and Mac, and AppVeyor CI for Windows. OpenWhisk CLI is a Go project. Currently Travis
-CI supports the environments of Linux and Mac, but it is not available for Windows, which is the reason why we
-uses AppVeyor CI to run the test cases and build the binary for Windows.
+delivery service for Linux and Mac. OpenWhisk CLI is a Go project. Currently Travis CI supports the environments
+of Linux and Mac, but it is not available for Windows. We will add support of AppVeyor CI in future to run the
+test cases and build the binary for Windows.
diff --git a/tests/src/integration/common/wskprops.go b/tests/src/integration/common/wskprops.go
index 876a5de..ab6a728 100644
--- a/tests/src/integration/common/wskprops.go
+++ b/tests/src/integration/common/wskprops.go
@@ -47,9 +47,9 @@ func GetWskprops() *Wskprops {
if err == nil {
dep.AuthKey = string(b)
}
- dep.APIHost = viper.GetString("router.host")
- dep.ControllerHost = viper.GetString("router.host")
- dep.ControllerPort = viper.GetString("controller.host.port")
+ dep.APIHost = viper.GetString("controller.hosts")
+ dep.ControllerHost = viper.GetString("controller.hosts")
+ dep.ControllerPort = viper.GetString("controller.host.basePort")
}
return &dep
}
diff --git a/tools/travis/install_openwhisk.sh b/tools/travis/install_openwhisk.sh
deleted file mode 100755
index 4bc601c..0000000
--- a/tools/travis/install_openwhisk.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-export OPENWHISK_HOME="$(dirname "$TRAVIS_BUILD_DIR")/incubator-openwhisk";
-HOMEDIR="$(dirname "$TRAVIS_BUILD_DIR")"
-cd $HOMEDIR
-
-# Clone the OpenWhisk code
-git clone --depth 3 https://github.com/apache/incubator-openwhisk.git
-
-# Build script for Travis-CI.
-WHISKDIR="$OPENWHISK_HOME"
-
-cd $WHISKDIR
-./tools/travis/setup.sh
-
-ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing"
-
-cd $WHISKDIR/ansible
-$ANSIBLE_CMD setup.yml
-$ANSIBLE_CMD prereq.yml
-$ANSIBLE_CMD couchdb.yml
-$ANSIBLE_CMD initdb.yml
-$ANSIBLE_CMD apigateway.yml
-
-cd $WHISKDIR
-./gradlew distDocker -PdockerImagePrefix=testing
-
-cd $WHISKDIR/ansible
-$ANSIBLE_CMD wipe.yml
-$ANSIBLE_CMD openwhisk.yml
-
-# Copy the binary generated into the OPENWHISK_HOME/bin, so that the test cases will run based on it.
-mkdir -p $WHISKDIR/bin
-cp $TRAVIS_BUILD_DIR/wsk $WHISKDIR/bin
-
-# Run the test cases under openwhisk to ensure the quality of the binary.
-cd $WHISKDIR
-./gradlew :tests:test -Dtest.single=Wsk*Tests*
-./gradlew tests:test -Dtest.single=*ApiGwRoutemgmtActionTests*
-sleep 30
-./gradlew tests:test -Dtest.single=*ApiGwTests*
-sleep 30
-./gradlew tests:test -Dtest.single=*ApiGwEndToEndTests*
-sleep 30
-make integration_test;
\ No newline at end of file
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
index 9d096d7..f25b51c 100755
--- a/tools/travis/test_openwhisk.sh
+++ b/tools/travis/test_openwhisk.sh
@@ -1,26 +1,48 @@
#!/usr/bin/env bash
-PIDS=()
-ERRORS=0
-
-function waitForAll() {
- for pid in ${PIDS[@]}; do
- wait $pid
- STATUS=$?
- echo "$pid finished with status $STATUS"
- if [ $STATUS -ne 0 ]
- then
- let ERRORS=ERRORS+1
- fi
- done
- PIDS=()
-}
-
-"$TRAVIS_BUILD_DIR/tools/travis/install_openwhisk.sh" &
-PID=$!
-PIDS+=($PID)
-
-waitForAll
-
-echo test openwhisk ERRORS = $ERRORS
-exit $ERRORS
+set -e
+
+export OPENWHISK_HOME="$(dirname "$TRAVIS_BUILD_DIR")/incubator-openwhisk";
+HOMEDIR="$(dirname "$TRAVIS_BUILD_DIR")"
+cd $HOMEDIR
+
+# Clone the OpenWhisk code
+git clone --depth 3 https://github.com/apache/incubator-openwhisk.git
+
+# Build script for Travis-CI.
+WHISKDIR="$OPENWHISK_HOME"
+
+cd $WHISKDIR
+./tools/travis/setup.sh
+
+ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing"
+
+cd $WHISKDIR/ansible
+$ANSIBLE_CMD setup.yml
+$ANSIBLE_CMD prereq.yml
+$ANSIBLE_CMD couchdb.yml
+$ANSIBLE_CMD initdb.yml
+$ANSIBLE_CMD apigateway.yml
+
+cd $WHISKDIR
+./gradlew distDocker -PdockerImagePrefix=testing
+
+cd $WHISKDIR/ansible
+$ANSIBLE_CMD wipe.yml
+$ANSIBLE_CMD openwhisk.yml
+
+# Copy the binary generated into the OPENWHISK_HOME/bin, so that the test cases will run based on it.
+mkdir -p $WHISKDIR/bin
+cp $TRAVIS_BUILD_DIR/wsk $WHISKDIR/bin
+
+# Run the test cases under openwhisk to ensure the quality of the binary.
+cd $WHISKDIR
+./gradlew :tests:test -Dtest.single=Wsk*Tests*
+./gradlew :tests:test -Dtest.single=*ApiGwRoutemgmtActionTests*
+sleep 30
+./gradlew :tests:test -Dtest.single=*ApiGwTests*
+sleep 30
+./gradlew :tests:test -Dtest.single=*ApiGwEndToEndTests*
+sleep 30
+cd $TRAVIS_BUILD_DIR
+make integration_test
--
To stop receiving notification emails like this one, please contact
"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>.