Merge "Pick first image if can't find the specific image"

1 files changed, 9 insertions, 1 deletions

diff --git a/novaclient/tests/functional/base.py b/novaclient/tests/functional/base.py
index 0b219035..263f7912 100644
--- a/novaclient/tests/functional/base.py
+++ b/novaclient/tests/functional/base.py
@@ -61,8 +61,16 @@ def pick_flavor(flavors):
 
 def pick_image(images):
     for image in images:
-        if image.name.startswith('cirros') and image.name.endswith('-uec'):
+        if image.name.startswith('cirros') and (
+                image.name.endswith('-uec') or
+                image.name.endswith('-disk.img')):
             return image
+
+    # We didn't find the specific cirros image we'd like to use, so just use
+    # the first available.
+    if images:
+        return images[0]
+
     raise NoImageException()