aboutsummaryrefslogtreecommitdiffstats
path: root/functest/ci
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-02-02 13:52:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-02 13:52:29 +0000
commit98bec6c6a3ec015fae82ec5ecd7f2fa7585b126f (patch)
treeec25fe0855e2ad60494b5bd0933ca1dff573b873 /functest/ci
parenta5da9f15d7fd4b85fb5a2ca5d376e2a47760df05 (diff)
parent219a2bd3271ba10d7d5462cd65e7eac217770d35 (diff)
Merge "Adapt Promise to new framework"
Diffstat (limited to 'functest/ci')
-rwxr-xr-xfunctest/ci/config_functest.yaml2
-rwxr-xr-xfunctest/ci/exec_test.sh13
-rwxr-xr-xfunctest/ci/testcases.yaml3
3 files changed, 4 insertions, 14 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 2feab771..f6cb14cb 100755
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -20,7 +20,7 @@ general:
repo_sdnvpn: /home/opnfv/repos/sdnvpn
repo_sfc: /home/opnfv/repos/sfc
dir_repo_onos: /home/opnfv/repos/onos
- dir_repo_promise: /home/opnfv/repos/promise
+ repo_promise: /home/opnfv/repos/promise
repo_doctor: /home/opnfv/repos/doctor
repo_copper: /home/opnfv/repos/copper
dir_repo_ovno: /home/opnfv/repos/ovno
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 54a7c624..b288fe36 100755
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -90,22 +90,12 @@ function run_test(){
--osusername ${OS_USERNAME} \
${args}
;;
- "vims")
- python ${FUNCTEST_TEST_DIR}/vnf/ims/vims.py $clean_flag $report
- ;;
"onos")
python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py
;;
"onos_sfc")
python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py -t sfc
;;
- "promise")
- python ${FUNCTEST_TEST_DIR}/features/promise.py $report
- sleep 10 # to let the instances terminate
- ;;
- "doctor")
- python ${FUNCTEST_TEST_DIR}/features/doctor.py $report
- ;;
"ovno")
# suite under rewritting for colorado
# no need to run anything until refactoring done
@@ -116,9 +106,6 @@ function run_test(){
source ${FUNCTEST_CONF_DIR}/stackrc
python ${FUNCTEST_TEST_DIR}/security_scan/security_scan.py --config ${FUNCTEST_TEST_DIR}/security_scan/config.ini
;;
- "copper")
- python ${FUNCTEST_TEST_DIR}/features/copper.py $report
- ;;
"moon")
python ${REPOS_DIR}/moon/tests/run_tests.py $report
;;
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 27d358bf..1733ef85 100755
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -185,6 +185,9 @@ tiers:
dependencies:
installer: '(fuel)|(joid)'
scenario: ''
+ run:
+ module: 'functest.opnfv_tests.features.promise'
+ class: 'Promise'
-
name: doctor