aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvitikkan <viktor.tikkanen@nokia.com>2016-05-11 10:28:18 +0300
committervitikkan <viktor.tikkanen@nokia.com>2016-05-11 12:09:07 +0300
commit31b76f41eb6566eb4bddf07fbfd5fb42fdf95594 (patch)
tree46318817f7ad6a1b3619d914d84ff8a5d0e171af
parente98b6bfeece4b68b439b67b5f2e3ed5352595510 (diff)
Split tempest into smoke and full modes
"tempest_smoke_serial" and "tempest_full_parallel" test cases replace the original "tempest" case. Corrected fetching tempest results from "rally verify list" output (last result is taken instead of the first one). This correction is needed when "rally verify start" is run multiple times. JIRA: FUNCTEST-242 Change-Id: I544a22081655af819dbaaaafc0ba0fa6eae1e4ea Signed-off-by: vitikkan <viktor.tikkanen@nokia.com>
-rwxr-xr-xci/exec_test.sh14
-rw-r--r--ci/testcases.yaml24
-rw-r--r--testcases/VIM/OpenStack/CI/libraries/run_tempest.py2
3 files changed, 20 insertions, 20 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index bd79dccd..3a823e73 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -64,6 +64,7 @@ function odl_tests(){
exit 1
fi
}
+
function run_test(){
test_name=$1
serial_flag=""
@@ -96,14 +97,13 @@ function run_test(){
python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO}
fi
;;
- "tempest")
+ "tempest_smoke_serial")
python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \
- $debug $serial_flag $clean_flag -m smoke $report
- # save tempest.conf for further troubleshooting
- tempest_conf="${RALLY_VENV_DIR}/tempest/for-deployment-*/tempest.conf"
- if [ -f ${tempest_conf} ]; then
- cp $tempest_conf ${FUNCTEST_CONF_DIR}
- fi
+ $debug $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
;;
"vims")
python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \
diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index 35a4b1c4..39e57222 100644
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -43,17 +43,17 @@ tiers:
installer: ''
scenario: ''
- #-
- # name: tempest_smoke_serial
- # description: >-
- # This test case runs the smoke subset of the OpenStack
- # Tempest suite. The list of test cases is generated by
- # Tempest automatically and depend on the parameters of
- # the OpenStack deplopyment.
- # dependencies:
- # installer: ''
- # scenario: ''
- #
+ -
+ name: tempest_smoke_serial
+ description: >-
+ This test case runs the smoke subset of the OpenStack
+ Tempest suite. The list of test cases is generated by
+ Tempest automatically and depend on the parameters of
+ the OpenStack deplopyment.
+ dependencies:
+ installer: ''
+ scenario: ''
+
-
name: rally_sanity
description: >-
@@ -150,7 +150,7 @@ tiers:
This test case runs the full set of the OpenStack Tempest suite.
testcases:
-
- name: tempest
+ name: tempest_full_parallel
description: >-
The list of test cases is generated by
Tempest automatically and depends on the parameters of
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
index 4c8e61a7..b042b49c 100644
--- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
@@ -260,7 +260,7 @@ def run_tempest(OPTION):
cmd_line = "rally verify list"
logger.debug('Executing command : {}'.format(cmd_line))
cmd = os.popen(cmd_line)
- output = (((cmd.read()).splitlines()[3]).replace(" ", "")).split("|")
+ output = (((cmd.read()).splitlines()[-2]).replace(" ", "")).split("|")
# Format:
# | UUID | Deployment UUID | smoke | tests | failures | Created at |
# Duration | Status |