diff options
author | 2017-08-22 01:33:18 +0000 | |
---|---|---|
committer | 2017-08-22 01:33:18 +0000 | |
commit | 7d2d3370744a9f578f9038d658724c631da8c001 (patch) | |
tree | d711c80da0c5e394fceb4ffbc6894bbac7044e97 | |
parent | 5ac27a4585038ae1f8cb830732eb1b295ac9bf93 (diff) | |
parent | d20cea153bd0ebed1996c11223787772e891b88f (diff) |
Merge "Modify tempest.conf to enable Tempest failed test cases to pass on Compass"
-rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 7bbecc129..d05b309cd 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -160,6 +160,37 @@ if [ $(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | wc -l) == 0 ]; then exit 1 fi +# Modify tempest_conf.yaml file +tempest_conf_file=${DOVETAIL_CONFIG}/tempest_conf.yaml +if [ ${INSTALLER_TYPE} == 'compass' ]; then + volume_device='vdb' +else + volume_device='vdc' +fi + +cat << EOF >$tempest_conf_file + +compute: + min_compute_nodes: 2 + volume_device_name: ${volume_device} + min_microversion: 2.0 + max_microversion: latest + +compute-feature-enabled: + live_migration: True + block_migration_for_live_migration: True + block_migrate_cinder_iscsi: True + attach_encrypted_volume: True + +EOF + +echo "${tempest_conf_file}..." +cat ${tempest_conf_file} + +cp_tempest_cmd="docker cp ${DOVETAIL_CONFIG}/tempest_conf.yaml $container_id:/home/opnfv/dovetail/dovetail/userconfig" +echo "exec command: ${cp_tempest_cmd}" +$cp_tempest_cmd + list_cmd="dovetail list ${TESTSUITE}" run_cmd="dovetail run --testsuite ${TESTSUITE} -d" echo "Container exec command: ${list_cmd}" |