Bad status on rally_sanity

[functest.git] / ci / exec_test.sh

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index d9f169c..7e57cd5 100755 (executable)
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -87,15 +87,15 @@ function run_test(){
                 --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/"
-            #     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}
-            # fi
+            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/"
+                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}
+            fi
         ;;
         "tempest_smoke_serial")
             python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
@@ -116,7 +116,20 @@ function run_test(){
                 $clean_flag --sanity all $report
         ;;
         "bgpvpn")
-            python ${repos_dir}/sdnvpn/test/functest/run_tests.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