From: Jose Lausuch <jose.lausuch@ericsson.com>
Date: Wed, 23 Nov 2016 08:52:53 +0000 (+0000)
Subject: Merge "bugfix: domino test can not be executed"
X-Git-Tag: 0.2~1070
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=453784f3cae39e7b59e530d27f0b49cef17c7e55;p=functest-xtesting.git

Merge "bugfix: domino test can not be executed"
---

453784f3cae39e7b59e530d27f0b49cef17c7e55
diff --cc functest/ci/exec_test.sh
index b15f5351,87216201..8dc409d3
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@@ -156,11 -156,10 +156,8 @@@ function run_test()
                  $clean_flag -s -m feature_multisite $report \
                  -c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf
          ;;
-         "domino")
-             python ${FUNCTEST_TEST_DIR}/features/domino.py $report
-         ;;
          "odl-sfc")
 -            pip install --upgrade python-keystoneclient==1.7.4
 -            ODL_SFC_DIR=${FUNCTEST_TEST_DIR}/features/sfc
 -            # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash
 +            ODL_SFC_DIR=${repos_dir}/sfc/tests/functest/odl-sfc
              FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $?
              source ${ODL_SFC_DIR}/tackerc
              python ${ODL_SFC_DIR}/sfc.py $report