From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Fri, 15 Jul 2016 12:14:24 +0000 (+0200)
Subject: Use blacklist of Tempest test cases for SDNVPN scenario
X-Git-Tag: colorado.1.0~234
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a7fd37c13857fd3b7a0d10ffe8d79ff1c45dc002;p=functest.git

Use blacklist of Tempest test cases for SDNVPN scenario

This patch disables tempest smoke from being executed in bgpvpn scenarios.
Since there is a known upstream issue which won't be resolved before Colorado,
it doesn't make sense to run the test cases in Tempest that will fail due
to that issue.
The Tempest suite will be triggered along with the "features" tier, with
a given blacklist of the known test that will fail.

JIRA: FUNCTEST-369

Change-Id: Ifc533077207e9d62d49bcedcc3cd0936df312891
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index d9f169c15..82a7a31bc 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -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
diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index b4d9b07e9..55d099c9c 100644
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -56,7 +56,7 @@ tiers:
                     the OpenStack deplopyment.
                 dependencies:
                     installer: ''
-                    scenario: ''
+                    scenario: '^(?!.*bgpvpn).*$'
 
             -
                 name: rally_sanity