1. devstack
  2. Commit 019bd53f0852bfe3756bf5bdc443b203467a4745
Browse code

XenAPI: Fix disk_formats verified by tempest

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 2dd761b16950603555409e33ac63a196eefd2607)

Bob Ball authored on 2016/01/15 22:56:37
Showing 1 changed files
lib/tempest
History View file @ 019bd53
... ... 
@@ -338,7 +338,9 @@ function configure_tempest {
338 338 
     if [[ ! -z "$TEMPEST_HTTP_IMAGE" ]]; then
339 339 
         iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE
340 340 
     fi
341 
-    iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image true
341 
+    if [ "$VIRT_DRIVER" = "xenserver" ]; then
342 
+        iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"
343 
+    fi
342 344
343 345 
     # Image Features
344 346 
     iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True