diff options
| author |   wu.zhihui <wu.zhihui1@zte.com.cn> | 2016-09-23 16:53:55 +0800 |
|---|---|---|
| committer | wu.zhihui <wu.zhihui1@zte.com.cn> | 2016-09-27 11:20:11 +0800 |
| commit | 1a2b55736da4d18758f81444933181e380202f60 (patch) | |
| tree | b6c0dec37b7989456feb82485aed629333e9af36 /docker/run_qtip.sh | |
| parent | 58ac79cd54821bf8c3891d136be4254aa79bfa08 (diff) | |
code refactor: run_qtip.sh
1. Add prepare_qtip_image.sh to prepare qtip image before qtip test.
2. Add cleanup_qtip_image.sh to clean up qtip image after finishing
qtip test.
Both of them are invoked in run_qtip.sh
Change-Id: Iba892a2e02e31820ed0525f80a4e2885899557e0
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
Diffstat (limited to 'docker/run_qtip.sh')
| -rwxr-xr-x | docker/run_qtip.sh | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/docker/run_qtip.sh b/docker/run_qtip.sh index 37eb0ea7..79529e54 100755 --- a/docker/run_qtip.sh +++ b/docker/run_qtip.sh @@ -1,40 +1,28 @@ #! /bin/bash - - - -cp ${REPOS_DIR}/releng/utils/fetch_os_creds.sh ${QTIP_DIR}/data/ -cd ${QTIP_DIR} && source get_env_info.sh \ --n ${INSTALLER_TYPE} \ --i ${INSTALLER_IP} - -source ${QTIP_DIR}/opnfv-creds.sh - -if [ "$TEST_CASE" == "compute" ]; then - cd ${QTIP_DIR} && python qtip.py -l default -f compute - cd ${QTIP_DIR}/data/ref_results/ && python compute_suite.py -fi - -if [ "$TEST_CASE" == "storage" ]; then - cd ${QTIP_DIR} && python qtip.py -l default -f storage - cd ${QTIP_DIR}/data/ref_results/ && python storage_suite.py -fi - -if [ "$TEST_CASE" == "network" ]; then - cd ${QTIP_DIR} && python qtip.py -l default -f network - cd ${QTIP_DIR}/data/ref_results/ && python network_suite.py -fi - - -if [ "$TEST_CASE" == "all" ]; then - cd ${QTIP_DIR} && python qtip.py -l default -f compute - cd ${QTIP_DIR} && python qtip.py -l default -f storage - cd ${QTIP_DIR} && python qtip.py -l default -f network - - cd ${QTIP_DIR}/data/ref_results/ && python compute_suite.py - cd ${QTIP_DIR}/data/ref_results/ && python storage_suite.py - cd ${QTIP_DIR}/data/ref_results/ && python network_suite.py -fi - - - - +run_test_suite() +{ + if [ "$TEST_CASE" == "compute" ]; then + cd ${QTIP_DIR} && python qtip.py -l default -f compute + cd ${QTIP_DIR}/data/ref_results/ && python compute_suite.py + elif [ "$TEST_CASE" == "storage" ]; then + cd ${QTIP_DIR} && python qtip.py -l default -f storage + cd ${QTIP_DIR}/data/ref_results/ && python storage_suite.py + elif [ "$TEST_CASE" == "network" ]; then + cd ${QTIP_DIR} && python qtip.py -l default -f network + cd ${QTIP_DIR}/data/ref_results/ && python network_suite.py + elif [ "$TEST_CASE" == "all" ]; then + cd ${QTIP_DIR} && python qtip.py -l default -f compute + cd ${QTIP_DIR} && python qtip.py -l default -f storage + cd ${QTIP_DIR} && python qtip.py -l default -f network + + cd ${QTIP_DIR}/data/ref_results/ && python compute_suite.py + cd ${QTIP_DIR}/data/ref_results/ && python storage_suite.py + cd ${QTIP_DIR}/data/ref_results/ && python network_suite.py + fi +} + +source ${QTIP_DIR}/docker/prepare_qtip_image.sh + +run_test_suite + +source ${QTIP_DIR}/docker/cleanup_qtip_image.sh |