diff options
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/prepare_env.sh | 8 | ||||
| -rwxr-xr-x | docker/run_tests.sh | 19 |
2 files changed, 14 insertions, 13 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index 4106e3bde..ea82ea1c0 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -221,7 +221,7 @@ if [ $RETVAL -ne 0 ]; then fi # Prepare Functest Environment -info "Functest: prepare Functest environment" +info "Preparing Functest environment..." python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py --debug start retval=$? if [ $retval != 0 ]; then @@ -229,6 +229,12 @@ if [ $retval != 0 ]; then exit $retval fi + +# Generate OpenStack defaults +info "Generating OpenStack defaults..." +python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py -d + + ifconfig eth0 mtu 1450 echo "1" > ${FUNCTEST_CONF_DIR}/env_active diff --git a/docker/run_tests.sh b/docker/run_tests.sh index e6b4cfea0..9d5f681ca 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -51,10 +51,10 @@ function clean_openstack(){ } function odl_tests(){ - keystone_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") + keystone_ip=$(openstack catalog show identity |grep publicURL| cut -f3 -d"/" | cut -f1 -d":") # historically most of the installers use the same IP for neutron and keystone API neutron_ip=$keystone_ip - odl_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") + odl_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=') password=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=') odl_port=8181 @@ -64,7 +64,7 @@ function odl_tests(){ : elif [ $INSTALLER_TYPE == "joid" ]; then odl_ip=$(env | grep SDN_CONTROLLER | cut -f2 -d'=') - neutron_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") + neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") odl_port=8080 : elif [ $INSTALLER_TYPE == "compass" ]; then @@ -76,9 +76,9 @@ function odl_tests(){ } function run_test(){ test_name=$1 - echo "" + echo -e "\n\n\n\n" echo "----------------------------------------------" - echo " Running test cases: $i" + echo " Running test case: $i" echo "----------------------------------------------" echo "" case $test_name in @@ -173,6 +173,7 @@ test/csit/suites/vpnservice "promise") info "Running PROMISE test case..." python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py --debug ${report} + sleep 10 #to let the instances terminate clean_openstack ;; "doctor") @@ -226,11 +227,11 @@ if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]] &&\ else arr_test=(vping tempest vims rally) fi -echo "arr_test: "${arr_test[@]} BASEDIR=`dirname $0` source ${BASEDIR}/common.sh +info "Tests to be executed: ${arr_test[@]}" # Check that the given tests are correct if [ "${TEST}" != "" ]; then @@ -243,12 +244,6 @@ if [ "${TEST}" != "" ]; then info "Tests to execute: ${TEST}." fi -if [ $offline == false ]; then - info "MODE: online" -else - info "MODE: offline" -fi - # Check that the functest environment has been installed if [ ! -f ${FUNCTEST_CONF_DIR}/env_active ]; then error "The Functest environment is not installed. \ |