summaryrefslogtreecommitdiffstats
path: root/testcases
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2016-09-06 14:15:31 +0000
committerMorgan Richomme <morgan.richomme@orange.com>2016-09-07 14:00:50 +0000
commit9924a099f99f4a72628f03baac10218afa8de4b6 (patch)
treeb12fbf6b559bf072c01c12067dd2ff7657bed8f0 /testcases
parent3ad0c4bc46b80d6af267db792d8b0322cc581034 (diff)
Fix image format set for rally test cases
Always use image format defined in config_functest.yaml when creating glance images. JIRA: FUNCTEST-460 Change-Id: Ica6b35605301bc14290daa23a1480114cf6294c0 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit b49d6129e2f6a15be9de7b7f04fbec0bd15ee8e6)
Diffstat (limited to 'testcases')
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py1
-rw-r--r--testcases/OpenStack/rally/scenario/opnfv-glance.yaml6
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 85d21d9bd..5aabb5d0a 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -160,6 +160,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 adbf8b79a..3a67e7457 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