aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-05-17 21:36:56 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2016-05-17 22:31:32 +0200
commit68d29b6f6e71df6b4f177cd417f98d9e977f8893 (patch)
tree11d740e368eee5ef2e6e7cd020cb25201df64e4c /ci
parentd338cc665efc9a2d73d6dff1567dc6de6bc63bd8 (diff)
Change 'testcases' directory structure
JIRA: FUNCTEST-226 - Remove all 'CI' subdirs - Remove VIM dir and have OpenStack dir within /testcases/ - Split rally and tempest in 2 different dirs Change-Id: Icfc76d18a84f7a18d93ae1a5ec7dc7a560bb7ce9 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/config_functest.yaml13
-rwxr-xr-xci/exec_test.sh36
-rw-r--r--ci/tier_handler.py4
3 files changed, 24 insertions, 29 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index 29a74afd5..ab620f023 100644
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -1,13 +1,12 @@
general:
directories:
# Relative to the path where the repo is cloned:
- dir_vping: testcases/vPing/CI/libraries/
- dir_odl: testcases/Controllers/ODL/CI/
- dir_rally: testcases/VIM/OpenStack/CI/libraries/
- dir_rally_scn: testcases/VIM/OpenStack/CI/rally_cert/
- dir_tempest_cases: testcases/VIM/OpenStack/CI/custom_tests/
- dir_vIMS: testcases/vIMS/CI/
- dir_onos: testcases/Controllers/ONOS/Teston/CI/
+ dir_vping: testcases/OpenStack/vPing/
+ dir_odl: testcases/Controllers/ODL/
+ dir_rally: testcases/OpenStack/rally/
+ dir_tempest_cases: testcases/OpenStack/tempest/custom_tests/
+ dir_vIMS: testcases/vIMS/
+ dir_onos: testcases/Controllers/ONOS/Teston/
# Absolute path
dir_repos: /home/opnfv/repos
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 013b98c2e..61d00c744 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -69,61 +69,57 @@ function run_test(){
case $test_name in
"healthcheck")
- ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh
+ ${FUNCTEST_REPO_DIR}/testcases/OpenStack/healthcheck/healthcheck.sh
;;
"vping_ssh")
- python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_ssh.py \
- $debug $report
+ python ${FUNCTEST_REPO_DIR}/testcases/vPing/vPing_ssh.py $report
;;
"vping_userdata")
- python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_userdata.py \
- $debug $report
+ python ${FUNCTEST_REPO_DIR}/testcases/vPing/vPing_userdata.py $report
;;
"odl")
odl_tests
ODL_PORT=$odl_port ODL_IP=$odl_ip KEYSTONE_IP=$keystone_ip NEUTRON_IP=$neutron_ip USR_NAME=${OS_USERNAME} PASS=${OS_PASSWORD} \
- ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+ ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh
# push results to the DB in case of CI
if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then
odl_logs="/home/opnfv/functest/results/odl/logs/2"
- odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI"
+ 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/VIM/OpenStack/CI/libraries/run_tempest.py \
- $debug $clean_flag -s -m smoke $report
+ python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+ $clean_flag -s -m smoke $report
;;
"tempest_full_parallel")
- python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \
- $debug $serial_flag $clean_flag -m full $report
+ python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+ $serial_flag $clean_flag -m full $report
;;
"vims")
- python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \
- $debug $clean_flag $report
+ python ${FUNCTEST_REPO_DIR}/testcases/vIMS/vIMS.py $clean_flag $report
;;
"rally_full")
- python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \
- $debug $clean_flag all $report
+ python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py $clean_flag all $report
;;
"rally_sanity")
- python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \
- $debug $clean_flag --sanity all $report
+ python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py \
+ $clean_flag --sanity all $report
;;
"bgpvpn")
python ${FUNCTEST_REPO_DIR}/testcases/features/bgpvpn.py
;;
"onos")
if [ "$INSTALLER_TYPE" == "joid" ]; then
- python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py -i joid
+ python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -i joid
else
- python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+ python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
fi
;;
"promise")
- python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $debug $report
+ python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report
sleep 10 # to let the instances terminate
;;
"doctor")
diff --git a/ci/tier_handler.py b/ci/tier_handler.py
index 2fc7a9c4d..03db4a91d 100644
--- a/ci/tier_handler.py
+++ b/ci/tier_handler.py
@@ -74,7 +74,7 @@ class Tier:
return self.ci_loop
def __str__(self):
- lines = split_text(self.description, LINE_LENGTH-6)
+ lines = split_text(self.description, LINE_LENGTH - 6)
out = ""
out += ("+%s+\n" % ("=" * (LINE_LENGTH - 2)))
@@ -120,7 +120,7 @@ class TestCase:
return self.name
def __str__(self):
- lines = split_text(self.description, LINE_LENGTH-6)
+ lines = split_text(self.description, LINE_LENGTH - 6)
out = ""
out += ("+%s+\n" % ("=" * (LINE_LENGTH - 2)))