aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-22 12:19:31 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-22 12:19:31 +0000
commit72cd11c677dda9d68679037484dce30283cd5c99 (patch)
tree3bdafe1448f6b1268495aa47dbe77d957440bc3d /docker
parentbc7cac06998c8b42f0b280029925ef4577f3a203 (diff)
parentdce18f616c5c0bf019f72c68c872570f26d2978b (diff)
Merge "Added --no-clean option for run_tests.sh"
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/run_tests.sh15
1 files changed, 11 insertions, 4 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 7cb06ab8..c0bf06a2 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -21,6 +21,7 @@ usage:
where:
-h|--help show this help text
-r|--report push results to database (false by default)
+ -n|--no-clean do not clean OpenStack resources after test run
-t|--test run specific set of tests
<test_name> one or more of the following: vping,odl,rally,tempest,vims,onos,promise,ovno. Separated by comma.
@@ -35,15 +36,18 @@ examples:
# NOTE: Still not 100% working when running the tests
offline=false
report=""
+clean=true
# Get the list of runnable tests
# Check if we are in CI mode
function clean_openstack(){
- echo -e "\n\nCleaning Openstack environment..."
- python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py \
- --debug
- echo -e "\n\n"
+ if [ $clean == true ]; then
+ echo -e "\n\nCleaning Openstack environment..."
+ python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py \
+ --debug
+ echo -e "\n\n"
+ fi
}
function run_test(){
@@ -169,6 +173,9 @@ while [[ $# > 0 ]]
-r|--report)
report="-r"
;;
+ -n|--no-clean)
+ clean=false
+ ;;
-t|--test|--tests)
TEST="$2"
shift