diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-06 15:16:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-06 15:16:15 +0000 |
| commit | 80241f5f8486bfc7ba79bcd47a69a25e719af8a2 (patch) | |
| tree | 9c69dfcc476d672654eae72b5c6bd8a0cd1dcdf7 | |
| parent | e848f2851a7d1d23915793e4e99e74bc4f3c4b02 (diff) | |
| parent | b49d6129e2f6a15be9de7b7f04fbec0bd15ee8e6 (diff) | |
Merge "Fix image format set for rally test cases"
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 1 | ||||
| -rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-glance.yaml | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index f1218545..7bd8b535 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -163,6 +163,7 @@ def build_task_args(test_file_name): task_args['image_name'] = GLANCE_IMAGE_NAME task_args['flavor_name'] = FLAVOR_NAME task_args['glance_image_location'] = GLANCE_IMAGE_PATH + task_args['glance_image_format'] = GLANCE_IMAGE_FORMAT task_args['tmpl_dir'] = TEMPLATE_DIR task_args['sup_dir'] = SUPPORT_DIR task_args['users_amount'] = USERS_AMOUNT diff --git a/testcases/OpenStack/rally/scenario/opnfv-glance.yaml b/testcases/OpenStack/rally/scenario/opnfv-glance.yaml index adbf8b79..3a67e745 100644 --- a/testcases/OpenStack/rally/scenario/opnfv-glance.yaml +++ b/testcases/OpenStack/rally/scenario/opnfv-glance.yaml @@ -1,7 +1,7 @@ GlanceImages.create_and_delete_image: - args: - {{ glance_args(location=glance_image_location) }} + {{ glance_args(location=glance_image_location, type=glance_image_format) }} context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: @@ -12,7 +12,7 @@ GlanceImages.create_and_list_image: - args: - {{ glance_args(location=glance_image_location) }} + {{ glance_args(location=glance_image_location, type=glance_image_format) }} context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: @@ -32,7 +32,7 @@ GlanceImages.create_image_and_boot_instances: - args: - {{ glance_args(location=glance_image_location) }} + {{ glance_args(location=glance_image_location, type=glance_image_format) }} flavor: name: {{ flavor_name }} number_instances: 2 |