summaryrefslogtreecommitdiffstats
path: root/run_tests.sh
diff options
context:
space:
mode:
Diffstat (limited to 'run_tests.sh')
-rwxr-xr-xrun_tests.sh19
1 files changed, 9 insertions, 10 deletions
diff --git a/run_tests.sh b/run_tests.sh
index 7e4be373..41104208 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -37,10 +37,9 @@ POSCA_TESTCASE="/home/opnfv/bottlenecks/testsuites/posca/testcase_cfg"
POSCA_TESTSTORY="/home/opnfv/bottlenecks/testsuites/posca/testsuite_story"
BASEDIR=`dirname $0`
-report=false
+REPORT="False"
cleanup=false
-
# Define alias for log printing
info () {
logger -s -t "bottlenecks.info" "$*"
@@ -109,8 +108,8 @@ function run_test(){
info "Pulling tutum/influxdb for yardstick"
docker pull tutum/influxdb:0.13
sleep 5
- info "Running posca test story: $test_exec"
- docker exec bottleneckcompose_bottlenecks_1 python ${POSCA_SUITE}/run_posca.py $test_level $test_exec
+ info "Running posca $test_level: $test_exec"
+ docker exec bottleneckcompose_bottlenecks_1 python ${POSCA_SUITE}/run_posca.py $test_level $test_exec $REPORT
;;
esac
}
@@ -134,7 +133,7 @@ while [[ $# > 0 ]]
shift
;;
--report)
- report=true
+ REPORT="True"
;;
--cleanup)
cleanup=true
@@ -148,11 +147,11 @@ while [[ $# > 0 ]]
done
# Clean up related docker images
-bash ${BASEDIR}/docker/docker_cleanup.sh -d bottlenecks --debug
-bash ${BASEDIR}/docker/docker_cleanup.sh -d yardstick --debug
-bash ${BASEDIR}/docker/docker_cleanup.sh -d kibana --debug
-bash ${BASEDIR}/docker/docker_cleanup.sh -d elasticsearch --debug
-bash ${BASEDIR}/docker/docker_cleanup.sh -d influxdb --debug
+#bash ${BASEDIR}/docker/docker_cleanup.sh -d bottlenecks --debug
+#bash ${BASEDIR}/docker/docker_cleanup.sh -d yardstick --debug
+#bash ${BASEDIR}/docker/docker_cleanup.sh -d kibana --debug
+#bash ${BASEDIR}/docker/docker_cleanup.sh -d elasticsearch --debug
+#bash ${BASEDIR}/docker/docker_cleanup.sh -d influxdb --debug
# Run tests
if [ "${teststory}" != "" ]; then