openstack/devstack
Code Issues Proposed changes

XenAPI: Fix disk_formats verified by tempest

Browse Source 
lib/glance restricts the disk_formats to those supported by XenAPI, so
tempest needs a similar restriction for the disk_formats tested.

Confirmed as passing internal Citrix CI (affected tempest jobs are
currently disabled in voting XenServer CI until this change lands)

Conflicts:
        lib/tempest

NOTE(mriedem): The conflict is due to this line being in lib/tempest
twice:

iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True

The duplication is removed so this is the same as master now.

Change-Id: Iefa5b16a3fa1789ed583426ea47ebb22e6cb571e
(cherry picked from commit 2dd761b169)
This commit is contained in:
Bob Ball
2016-01-15 13:56:37 +00:00
committed by Matt Riedemann
parent bcc239f30f
commit 019bd53f08
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@@ -338,7 +338,9 @@ function configure_tempest {
if [[ ! -z "$TEMPEST_HTTP_IMAGE" ]]; then
iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE
fi
iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image true
if [ "$VIRT_DRIVER" = "xenserver" ]; then
iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"
fi
# Image Features
iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True