Bad status on rally_sanity

[functest.git] / ci / exec_test.sh

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 32988f8..7e57cd5 100755 (executable)
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -48,7 +48,7 @@ function odl_tests(){
     if [ "$INSTALLER_TYPE" == "fuel" ]; then
         odl_port=8282
     elif [ "$INSTALLER_TYPE" == "apex" ]; then
-        :
+        odl_ip=$SDN_CONTROLLER_IP
     elif [ "$INSTALLER_TYPE" == "joid" ]; then
         odl_ip=$SDN_CONTROLLER
         odl_port=8080
@@ -56,7 +56,7 @@ function odl_tests(){
     elif [ "$INSTALLER_TYPE" == "compass" ]; then
         :
     else
-        odl_ip=$SDN_CONTROLLER
+        odl_ip=$SDN_CONTROLLER_IP
         odl_port=8080
     fi
 }
@@ -80,16 +80,18 @@ function run_test(){
         ;;
         "odl")
             odl_tests
-            ODL_WEB_PORT=$odl_port ODL_IP=$odl_ip KEYSTONE_IP=$keystone_ip NEUTRON_IP=$neutron_ip \
-                TENANT_NAME=${OS_TENANT_NAME} USR_NAME=${OS_USERNAME} PASS=${OS_PASSWORD} \
-                ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh
+            ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/OpenDaylightTesting.py \
+                --keystoneip $keystone_ip --neutronip $neutron_ip \
+                --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
+                --ospassword ${OS_PASSWORD} \
+                --odlip $odl_ip --odlwebport $odl_port
 
             # push results to the DB in case of CI
             if [[ "$report" == "-r" &&
                   -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" &&
                   -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] &&
                env | grep NODE_NAME > /dev/null; then
-                odl_logs="/home/opnfv/functest/results/odl/logs/2"
+                odl_logs="/home/opnfv/functest/results/odl/"
                 odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
                 node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
                 python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO}
@@ -114,7 +116,20 @@ function run_test(){
                 $clean_flag --sanity all $report
         ;;
         "bgpvpn")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/bgpvpn.py
+            sdnvpn_repo_dir=${repos_dir}/sdnvpn/test/functest/
+            # Copy blacklist from sdnvpn repo to the proper place to execute functest
+            src=${sdnvpn_repo_dir}/tempest_blacklist.txt
+            dst=${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/custom_tests/blacklist.txt
+            cp $src $dst
+            # Execute tempest smoke with blacklist
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+                $clean_flag -s -m smoke $report
+            # Remove blacklist file
+            rm $dst
+
+            # Execute SDNVPN test cases
+            python ${sdnvpn_repo_dir}/run_tests.py $report
+
         ;;
         "onos")
             python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
@@ -145,6 +160,11 @@ function run_test(){
         ;;
         "multisite")
             python ${FUNCTEST_REPO_DIR}/testcases/features/multisite.py
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+                $clean_flag -s -m feature_multisite $report
+        ;;
+        "domino")
+            python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py
         ;;
         *)
             echo "The test case '${test_name}' does not exist."