[incubator-openwhisk-performance] 14/22: More refactoring

[ma...@apache.org]

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-performance.git

commit d10646e70fc600b37feda3830b6511a9b08265fb
Author: Markus Thoemmes <ma...@de.ibm.com>
AuthorDate: Mon Apr 24 14:05:14 2017 +0200

    More refactoring
---
 .travis.yml | 2 +-
 deploy.sh   | 2 ++
 test.sh     | 7 ++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b65bda..8231114 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@ install:
   - ./deploy.sh
 
 script:
-  - ./test.sh
\ No newline at end of file
+  - ./test.sh "http://172.17.0.1:10001" "$(cat openwhisk/ansible/files/auth.guest)"
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
index 56f755d..b9ab8b7 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # 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'
diff --git a/test.sh b/test.sh
index 4b464fa..e2d0510 100755
--- a/test.sh
+++ b/test.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 set -e
 
+host=$1
+credentials=$2
+
 action="noop"
-credentials="$(cat openwhisk/ansible/files/auth.guest)"
-host="172.17.0.1:10001"
 
 # create a noop action
 echo "Creating noop action"
@@ -14,4 +15,4 @@ echo "Running noop action once to assert an intact system"
 curl -u "$credentials" "$host/api/v1/namespaces/_/actions/$action?blocking=true" -XPOST
 
 # run performance harness
-docker run --rm markusthoemmes/loadtest loadtest -n 10000 -H "Authorization: basic $(echo $credentials | base64 -w 0)" "http://$host/api/v1/namespaces/_/actions/$action?blocking=true" -m POST
\ No newline at end of file
+docker run --rm markusthoemmes/loadtest loadtest -n 10000 -k -m POST -H "Authorization: basic $(echo $credentials | base64 -w 0)" "$host/api/v1/namespaces/_/actions/$action?blocking=true"
\ No newline at end of file

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