openstack/openstack-ansible
Code Issues Proposed changes

Merge "Update tempest and AIO to test cinder backups"

Browse Source
This commit is contained in:
Jenkins 2015-04-30 15:56:22 +00:00 committed by Gerrit Code Review
commit ac95fc29bf
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/os_tempest/defaults/main.yml
View File

@ -58,6 +58,8 @@ tempest_boto_ec2_url: "http://{{ external_lb_vip_address }}:8773/services/Cloud"
tempest_swift_enabled: false tempest_swift_enabled: false
tempest_swift_object_versioning: True tempest_swift_object_versioning: True
tempest_volume_backup_enabled: False
tempest_git_repo: https://github.com/openstack/tempest tempest_git_repo: https://github.com/openstack/tempest
tempest_git_install_branch: master tempest_git_install_branch: master
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"

5
playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2
View File

@ -62,6 +62,11 @@ function gen_test_list_heat_api() {
egrep 'tempest\.api\.orchestration\.stacks\.test_non_empty_stack' egrep 'tempest\.api\.orchestration\.stacks\.test_non_empty_stack'
} }
# Run cinder backup api tests
function gen_test_list_cinder_backup() {
egrep 'tempest\.api\.volume\.admin\.test_volumes_backup'
}
# Run smoke tests # Run smoke tests
function gen_test_list_smoke() { function gen_test_list_smoke() {
# this specific test fails frequently and is making our multi node nightly # this specific test fails frequently and is making our multi node nightly

2
playbooks/roles/os_tempest/templates/tempest.conf.j2
View File

@ -230,7 +230,7 @@ volume_size = 1
api_extensions = all api_extensions = all
api_v1 = true api_v1 = true
api_v2 = false api_v2 = false
backup = false backup = {{ tempest_volume_backup_enabled }}
multi_backend = false multi_backend = false
snapshot = false snapshot = false

2
scripts/bootstrap-aio.sh
View File

@ -325,6 +325,8 @@ if [ "${DEPLOY_SWIFT}" == "yes" ]; then
sed -i "s/glance_swift_store_key:.*/glance_swift_store_key: '{{ keystone_auth_admin_password }}'/" /etc/openstack_deploy/user_secrets.yml sed -i "s/glance_swift_store_key:.*/glance_swift_store_key: '{{ keystone_auth_admin_password }}'/" /etc/openstack_deploy/user_secrets.yml
sed -i "s/glance_swift_store_region:.*/glance_swift_store_region: ${SERVICE_REGION}/" /etc/openstack_deploy/user_secrets.yml sed -i "s/glance_swift_store_region:.*/glance_swift_store_region: ${SERVICE_REGION}/" /etc/openstack_deploy/user_secrets.yml
sed -i "s/glance_swift_store_user:.*/glance_swift_store_user: '{{ keystone_admin_user_name }}:{{ keystone_admin_tenant_name }}'/" /etc/openstack_deploy/user_secrets.yml sed -i "s/glance_swift_store_user:.*/glance_swift_store_user: '{{ keystone_admin_user_name }}:{{ keystone_admin_tenant_name }}'/" /etc/openstack_deploy/user_secrets.yml
echo "cinder_service_backup_program_enabled: True" | tee -a /etc/openstack_deploy/user_variables.yml
echo "tempest_volume_backup_enabled: True" | tee -a /etc/openstack_deploy/user_variables.yml
fi fi
if [ ! -z "${RABBITMQ_PACKAGE_URL}" ]; then if [ ! -z "${RABBITMQ_PACKAGE_URL}" ]; then

2
scripts/run-tempest.sh
View File

@ -22,7 +22,7 @@ export TEMPEST_SCRIPT_PATH=${TEMPEST_SCRIPT_PATH:-/opt/openstack_tempest_gate.sh
## TODO(someone) this needs to be changed back to the normal tests once someone ## TODO(someone) this needs to be changed back to the normal tests once someone
## is able to dig into tempest/the updated/deprecated config(s). This test should ## is able to dig into tempest/the updated/deprecated config(s). This test should
## go back to being the scenario tests. ## go back to being the scenario tests.
export TEMPEST_SCRIPT_PARAMETERS=${TEMPEST_SCRIPT_PARAMETERS:-"scenario heat_api"} export TEMPEST_SCRIPT_PARAMETERS=${TEMPEST_SCRIPT_PARAMETERS:-"scenario heat_api cinder_backup"}
export RUN_TEMPEST_OPTS=${RUN_TEMPEST_OPTS:-''} export RUN_TEMPEST_OPTS=${RUN_TEMPEST_OPTS:-''}
export TESTR_OPTS=${TESTR_OPTS:-''} export TESTR_OPTS=${TESTR_OPTS:-''}