X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Frun_tests.sh;h=ad8ab1128ae5523a1706e0ecef51da26106a6a08;hb=a71001dc2874725b494be6a0c18a586c5d0bfbe2;hp=e6b4cfea0df14be250bbf6d2e604a91794a5173d;hpb=abfd2e7b94e4028e8ac032a5282f648b9dac08ec;p=functest.git diff --git a/docker/run_tests.sh b/docker/run_tests.sh index e6b4cfea0..ad8ab1128 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -22,13 +22,15 @@ 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 + -s|--serial run tests in one thread -t|--test run specific set of tests - one or more of the following: vping,odl,rally,tempest,vims,onos,promise,ovno. Separated by comma. + one or more of the following separated by comma: + vping_ssh,vping_userdata,odl,onos,tempest,rally,vims,promise,doctor examples: $(basename "$0") - $(basename "$0") --test vping,odl + $(basename "$0") --test vping_ssh,odl $(basename "$0") -t tempest,rally" @@ -37,6 +39,8 @@ examples: offline=false report="" clean=true +serial=false + # Get the list of runnable tests # Check if we are in CI mode @@ -51,10 +55,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 +68,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,21 +80,30 @@ 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 "" + clean_flag="" + if [ $clean == "false" ]; then + clean_flag="-n" + fi + serial_flag="" + if [ $serial == "true" ]; then + serial_flag="-s" + fi + case $test_name in - "vping") - info "Running vPing test..." - python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing2.py \ - --debug ${report} + "vping_ssh") + info "Running vPing-SSH test..." + python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_ssh.py \ + --debug $clean_flag ${report} ;; "vping_userdata") - info "Running vPing test using userdata/cloudinit.... " - python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \ - --debug ${report} + info "Running vPing-userdata test... " + python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_userdata.py \ + --debug $clean_flag ${report} ;; "odl") info "Running ODL test..." @@ -109,7 +122,7 @@ function run_test(){ "tempest") info "Running Tempest tests..." python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \ - --debug -m custom ${report} + --debug $serial_flag $clean_flag -m custom ${report} # save tempest.conf for further troubleshooting tempest_conf="${RALLY_VENV_DIR}/tempest/for-deployment-*/tempest.conf" if [ -f ${tempest_conf} ]; then @@ -120,13 +133,13 @@ function run_test(){ "vims") info "Running vIMS test..." python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \ - --debug ${report} + --debug $clean_flag ${report} clean_openstack ;; "rally") info "Running Rally benchmark suite..." python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \ - --debug all ${report} + --debug $clean_flag all ${report} clean_openstack ;; @@ -141,6 +154,7 @@ function run_test(){ pushd $tempest_dir . .venv/bin/activate pip install --no-deps -e ~/repos/bgpvpn/. + mkdir -p /etc/tempest/ cp tempest.conf /etc/tempest/ echo "[service_available] bgpvpn = True" >> /etc/tempest/tempest.conf @@ -173,6 +187,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") @@ -206,6 +221,9 @@ while [[ $# > 0 ]] -n|--no-clean) clean=false ;; + -s|--serial) + serial=true + ;; -t|--test|--tests) TEST="$2" shift @@ -224,13 +242,13 @@ if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]] &&\ [[ -f $tests_file ]]; then arr_test=($(cat $tests_file)) else - arr_test=(vping tempest vims rally) + arr_test=(vping_ssh 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 +261,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. \