This is an automated email from the ASF dual-hosted git repository. markusthoemmes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push: new 70db77c Add build matrix to execute performance tests. (#3527) 70db77c is described below commit 70db77c19425f6f2938ed12a40a3b0cb886d5ebf Author: Christian Bickel <git...@cbickel.de> AuthorDate: Fri Apr 6 08:31:07 2018 +0200 Add build matrix to execute performance tests. (#3527) --- .travis.yml | 22 ++++++++++++++++++---- performance/.travis.yml | 14 -------------- performance/preparation/deploy.sh | 18 ++++++++---------- tools/travis/build.sh | 3 --- 4 files changed, 26 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbad0f9..52d6109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,11 @@ scala: services: - docker +env: + global: + - ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing" + - GRADLE_PROJS_SKIP="-x :actionRuntimes:pythonAction:distDocker -x :actionRuntimes:python2Action:distDocker -x actionRuntimes:swift3.1.1Action:distDocker -x actionRuntimes:swift4.1Action:distDocker -x :actionRuntimes:javaAction:distDocker" + notifications: email: false slack: @@ -48,7 +53,16 @@ before_install: install: - ./tools/travis/setup.sh -script: - - ./tools/travis/build.sh - - ansible-playbook -i ansible/environments/local ansible/logs.yml # collect logs regardless of build exit - - ./tools/travis/box-upload.py "$TRAVIS_BUILD_DIR/logs" "$TRAVIS_BUILD_ID-$TRAVIS_BRANCH.tar.gz" +jobs: + include: + - script: + - ./tools/travis/build.sh + - ansible-playbook -i ansible/environments/local ansible/logs.yml # collect logs regardless of build exit + - ./tools/travis/box-upload.py "$TRAVIS_BUILD_DIR/logs" "$TRAVIS_BUILD_ID-$TRAVIS_BRANCH.tar.gz" + env: DESCRIPTION="Execute test suite." + - script: + - ./performance/preparation/deploy.sh + - TERM=dumb ./performance/wrk_tests/latency.sh "https://172.17.0.1:10001" "$(cat ansible/files/auth.guest)" 2m + - TERM=dumb ./performance/wrk_tests/throughput.sh "https://172.17.0.1:10001" "$(cat ansible/files/auth.guest)" 4 2 2m + env: + - DESCRIPTION="Execute wrk-performance test suite." diff --git a/performance/.travis.yml b/performance/.travis.yml deleted file mode 100644 index b425c60..0000000 --- a/performance/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -sudo: required -language: java -services: - - docker - -env: - - TERM=dumb - -install: - - ./preparation/deploy.sh - -script: - - ./wrk_tests/latency.sh "http://172.17.0.1:10001" "$(cat openwhisk/ansible/files/auth.guest)" 2m - - ./wrk_tests/throughput.sh "http://172.17.0.1:10001" "$(cat openwhisk/ansible/files/auth.guest)" 4 2 2m diff --git a/performance/preparation/deploy.sh b/performance/preparation/deploy.sh index 5628176..0c9bfbe 100755 --- a/performance/preparation/deploy.sh +++ b/performance/preparation/deploy.sh @@ -1,18 +1,16 @@ #!/bin/sh set -e -currentDir="$(cd "$(dirname "$0")"; pwd)" +SCRIPTDIR="$(cd "$(dirname "$0")"; pwd)" +ROOTDIR="$SCRIPTDIR/../.." -# common docker setup -sudo gpasswd -a travis docker -sudo -E bash -c 'echo '\''DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock --storage-driver=overlay --userns-remap=default"'\'' > /etc/default/docker' -sudo service docker restart +# Build Openwhisk +cd $ROOTDIR +TERM=dumb ./gradlew distDocker -PdockerImagePrefix=testing $GRADLE_PROJS_SKIP -# install ansible -pip install --user ansible==2.4.2.0 - -cd $currentDir/../../ansible -ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=openwhisk -e docker_registry=docker.io/ -e limit_invocations_per_minute=999999 -e limit_invocations_concurrent=999999 -e limit_invocations_concurrent_system=999999" +# Deploy Openwhisk +cd $ROOTDIR/ansible +ANSIBLE_CMD="$ANSIBLE_CMD -e limit_invocations_per_minute=999999 -e limit_invocations_concurrent=999999 -e limit_invocations_concurrent_system=999999 -e controller_client_auth=false" $ANSIBLE_CMD setup.yml $ANSIBLE_CMD prereq.yml diff --git a/tools/travis/build.sh b/tools/travis/build.sh index ee2750d..765bd25 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -46,9 +46,6 @@ fi cd $ROOTDIR/ansible -ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing" -GRADLE_PROJS_SKIP="-x :actionRuntimes:pythonAction:distDocker -x :actionRuntimes:python2Action:distDocker -x actionRuntimes:swift3.1.1Action:distDocker -x actionRuntimes:swift4.1Action:distDocker -x :actionRuntimes:javaAction:distDocker" - $ANSIBLE_CMD setup.yml -e mode=HA $ANSIBLE_CMD prereq.yml $ANSIBLE_CMD couchdb.yml -- To stop receiving notification emails like this one, please contact markusthoem...@apache.org.