openstack/ceilometer
Code Issues Proposed changes

Merge "tempest: allow usage of scenario-img for autoscaling"

Browse Source
This commit is contained in:
Jenkins 2017-01-03 18:55:26 +00:00 committed by Gerrit Code Review
commit 0f8cbec5d1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometer/tests/tempest/scenario/test_autoscaling.py
View File

@ -66,11 +66,14 @@ class TestAutoscalingGabbi(test.BaseTestCase):
images = cls.os_admin.image_client_v2.list_images()["images"]
for img in images:
name = img["name"]
if name.startswith("cirros") and name.endswith("-uec"):
# devstack or tempest format
if ((name.startswith("cirros") and name.endswith("-uec")) or
name == 'scenario-img'):
os.environ["GLANCE_IMAGE_NAME"] = name
break
else:
cls.skipException("A cirros-.*-uec image is required")
cls.skipException("A cirros-.*-uec/cirros image is required")
@staticmethod
def clear_credentials():