aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2016-06-13 13:59:29 +0000
committerJuha Kosonen <juha.kosonen@nokia.com>2016-06-13 14:03:42 +0000
commitcaaf1129d6ed40484b68d4eec4ed2da0d8fca98b (patch)
tree78bb26cd46c86bc4ecdfda6116c60fbb038c656d
parent78dc8149929ba2ba9dc961a73a0b4b8638ad7610 (diff)
Remove unnecessary defaults from rally task file
Parameters used in test scenarios are defined and correctly set by run script. No need to hardcode defaults in task file. JIRA: FUNCTEST-311 Change-Id: Ic7decfc5144c40a50cd32862eb4aed263930a78e Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py1
-rw-r--r--testcases/OpenStack/rally/task.yaml12
2 files changed, 1 insertions, 12 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index a8628bc51..abff07be6 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -176,6 +176,7 @@ def build_task_args(test_file_name):
task_args['sup_dir'] = SUPPORT_DIR
task_args['users_amount'] = USERS_AMOUNT
task_args['tenants_amount'] = TENANTS_AMOUNT
+ task_args['use_existing_users'] = False
task_args['iterations'] = ITERATIONS_AMOUNT
task_args['concurrency'] = CONCURRENCY
diff --git a/testcases/OpenStack/rally/task.yaml b/testcases/OpenStack/rally/task.yaml
index b67891664..3dded7db0 100644
--- a/testcases/OpenStack/rally/task.yaml
+++ b/testcases/OpenStack/rally/task.yaml
@@ -1,18 +1,6 @@
-{%- set glance_image_location = glance_image_location|default("http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img") %}
-{%- set image_name = image_name|default("functest-img-rally") %}
-{%- set flavor_name = flavor_name|default("m1.tiny") %}
-{%- set use_existing_users = use_existing_users|default(false) %}
-{%- set service_list = service_list|default(["authenticate", "cinder", "keystone", "nova", "glance", "neutron", "quotas", "requests", "heat", "vm"]) %}
-{%- set live_migration = live_migration|default(false) %}
-{%- set smoke = smoke|default(true) %}
-{%- set floating_network = floating_network|default("net04_ext") %}
-{%- set controllers_amount = controllers_amount|default(1) %}
{%- if smoke %}
{%- set users_amount = 1 %}
{%- set tenants_amount = 1 %}
-{%- else %}
-{%- set users_amount = users_amount|default(1) %}
-{%- set tenants_amount = tenants_amount|default(1) %}
{%- endif %}
{%- from "macro/macro.yaml" import user_context, vm_params, unlimited_volumes, constant_runner, rps_runner, no_failures_sla -%}