Merge "Update tempest and AIO to test cinder backups"
This commit is contained in:
commit
ac95fc29bf
playbooks/roles/os_tempest
scripts
@ -58,6 +58,8 @@ tempest_boto_ec2_url: "http://{{ external_lb_vip_address }}:8773/services/Cloud"
|
||||
tempest_swift_enabled: false
|
||||
tempest_swift_object_versioning: True
|
||||
|
||||
tempest_volume_backup_enabled: False
|
||||
|
||||
tempest_git_repo: https://github.com/openstack/tempest
|
||||
tempest_git_install_branch: master
|
||||
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
|
||||
|
@ -62,6 +62,11 @@ function gen_test_list_heat_api() {
|
||||
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
|
||||
function gen_test_list_smoke() {
|
||||
# this specific test fails frequently and is making our multi node nightly
|
||||
|
@ -230,7 +230,7 @@ volume_size = 1
|
||||
api_extensions = all
|
||||
api_v1 = true
|
||||
api_v2 = false
|
||||
backup = false
|
||||
backup = {{ tempest_volume_backup_enabled }}
|
||||
multi_backend = false
|
||||
snapshot = false
|
||||
|
||||
|
@ -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_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
|
||||
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
|
||||
|
||||
if [ ! -z "${RABBITMQ_PACKAGE_URL}" ]; then
|
||||
|
@ -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
|
||||
## is able to dig into tempest/the updated/deprecated config(s). This test should
|
||||
## 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 TESTR_OPTS=${TESTR_OPTS:-''}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user