summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocker/common.sh11
-rwxr-xr-xdocker/prepare_env.sh7
-rwxr-xr-xdocker/run_tests.sh13
3 files changed, 13 insertions, 18 deletions
diff --git a/docker/common.sh b/docker/common.sh
index ccb653f88..b81dedf7e 100755
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -45,16 +45,6 @@ fi
# Directories
REPOS_DIR=$(cat $config_file | grep -w dir_repos | awk 'END {print $NF}')
FUNCTEST_REPO_DIR=$(cat $config_file | grep -w dir_repo_functest | awk 'END {print $NF}')
-RALLY_REPO_DIR=$(cat $config_file | grep -w dir_repo_rally | awk 'END {print $NF}')
-RELENG_REPO_DIR=$(cat $config_file | grep -w dir_repo_releng | awk 'END {print $NF}')
-VIMS_REPO_DIR=$(cat $config_file | grep -w dir_repo_vims_test | awk 'END {print $NF}')
-BGPVPN_REPO_DIR=$(cat $config_file | grep -w dir_repo_bgpvpn | awk 'END {print $NF}')
-ONOS_REPO_DIR=$(cat $config_file | grep -w dir_repo_onos | awk 'END {print $NF}')
-PROMISE_REPO_DIR=$(cat $config_file | grep -w dir_repo_promise | awk 'END {print $NF}')
-OVNO_REPO_DIR=$(cat $config_file | grep -w dir_repo_ovno | awk 'END {print $NF}')
-DOCTOR_REPO_DIR=$(cat $config_file | grep -w dir_repo_doctor | awk 'END {print $NF}')
-
-
FUNCTEST_DIR=$(cat $config_file | grep -w dir_functest | awk 'END {print $NF}')
FUNCTEST_RESULTS_DIR=$(cat $config_file | grep -w dir_results | awk 'END {print $NF}')
FUNCTEST_CONF_DIR=$(cat $config_file | grep -w dir_functest_conf | awk 'END {print $NF}')
@@ -66,7 +56,6 @@ info () {
logger -s -t "FUNCTEST.info" "$*"
}
-
error () {
logger -s -t "FUNCTEST.error" "$*"
exit 1
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index b1aa71738..d2b5f4dfb 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -46,6 +46,11 @@ done
BASEDIR=`dirname $0`
source ${BASEDIR}/common.sh
+debug=""
+if [[ "${CI_DEBUG,,}" == "true" ]];then
+ debug="--debug"
+fi
+
info "######### Preparing Functest environment #########"
@@ -111,7 +116,7 @@ fi
# Prepare Functest Environment
info "Preparing Functest environment..."
-python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py --debug start
+python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py $debug start
retval=$?
if [ $retval != 0 ]; then
error "Error when configuring Functest environment"
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index ab8e6e65a..8e1e733e5 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -35,6 +35,9 @@ examples:
$(basename "$0") -t tempest,rally"
+BASEDIR=`dirname $0`
+source ${BASEDIR}/common.sh
+
report=""
clean=true
serial=false
@@ -48,10 +51,11 @@ fi
function clean_openstack(){
if [ $clean == true ]; then
- echo -e "\n\nCleaning Openstack environment..."
+ echo -e "\n"
+ info "Cleaning Openstack environment..."
python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py \
$debug
- echo -e "\n\n"
+ echo -e "\n"
fi
}
@@ -156,8 +160,7 @@ function run_test(){
popd
tempest_dir=$(ls -t /home/opnfv/.rally/tempest/ |grep for-deploy |tail -1)
if [[ $tempest_dir == "" ]]; then
- echo "Make sure tempest was running before"
- exit 1
+ error "Make sure tempest was running before"
fi
tempest_dir=/home/opnfv/.rally/tempest/$tempest_dir
pushd $tempest_dir
@@ -236,8 +239,6 @@ else
arr_test=(healthcheck vping_ssh vping_userdata tempest vims rally)
fi
-BASEDIR=`dirname $0`
-source ${BASEDIR}/common.sh
info "Tests to be executed: ${arr_test[@]}"