From 6263827c7f0db5b5f55ed0b0e5a9ed11b4d8dd0b Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Fri, 5 Feb 2016 16:01:47 +0000 Subject: Reduce the number of iterations to ten in rally scenarios Change-Id: Ibefc3f5eeb57ff6a1daa0be26f482ed0376a0d40 Signed-off-by: Juha Kosonen (cherry picked from commit 01608c214878c19c9f01c60e1b08e106a5d684cf) --- .../VIM/OpenStack/CI/libraries/run_rally-cert.py | 7 ++-- .../CI/rally_cert/scenario/opnfv-authenticate.yaml | 12 +++---- .../CI/rally_cert/scenario/opnfv-cinder.yaml | 34 +++++++++--------- .../CI/rally_cert/scenario/opnfv-glance.yaml | 8 ++--- .../CI/rally_cert/scenario/opnfv-heat.yaml | 26 +++++++------- .../CI/rally_cert/scenario/opnfv-keystone.yaml | 22 ++++++------ .../CI/rally_cert/scenario/opnfv-neutron.yaml | 24 ++++++------- .../CI/rally_cert/scenario/opnfv-nova.yaml | 42 +++++++++++----------- .../CI/rally_cert/scenario/opnfv-quotas.yaml | 10 +++--- .../CI/rally_cert/scenario/opnfv-requests.yaml | 4 +-- .../OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml | 4 +-- 11 files changed, 98 insertions(+), 95 deletions(-) diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py index 265978503..0fb6ce7d4 100755 --- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py @@ -101,7 +101,9 @@ SUPPORT_DIR = SCENARIOS_DIR + "scenario/support" FLAVOR_NAME = "m1.tiny" USERS_AMOUNT = 2 TENANTS_AMOUNT = 3 -CONTROLLERS_AMOUNT = 2 +ITERATIONS_AMOUNT = 10 +CONCURRENCY = 4 + ### RESULTS_DIR = functest_yaml.get("general").get("directories"). \ get("dir_rally_res") @@ -185,7 +187,8 @@ 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['controllers_amount'] = CONTROLLERS_AMOUNT + task_args['iterations'] = ITERATIONS_AMOUNT + task_args['concurrency'] = CONCURRENCY return task_args diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-authenticate.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-authenticate.yaml index 8d7f0e7cb..a04e4c1c1 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-authenticate.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-authenticate.yaml @@ -3,7 +3,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -14,7 +14,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -25,7 +25,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -36,7 +36,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -47,7 +47,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -58,6 +58,6 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml index 723db65ff..b128ffb7f 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml @@ -10,7 +10,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -25,7 +25,7 @@ {{ volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -41,7 +41,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -53,7 +53,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -65,7 +65,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -80,7 +80,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -96,7 +96,7 @@ {{ volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -111,7 +111,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -124,7 +124,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -142,7 +142,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -157,7 +157,7 @@ {{ volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -179,7 +179,7 @@ network: {} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -201,7 +201,7 @@ network: {} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -221,7 +221,7 @@ network: {} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -232,7 +232,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} - args: size: @@ -244,7 +244,7 @@ {{ unlimited_volumes() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -261,6 +261,6 @@ volumes_per_tenant: 4 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-glance.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-glance.yaml index b5eb7f3f5..adbf8b79a 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-glance.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-glance.yaml @@ -5,7 +5,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -16,7 +16,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -25,7 +25,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -43,7 +43,7 @@ quotas: {{ unlimited_nova() }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml index dd8b282a6..a854bcc2e 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml @@ -5,7 +5,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -18,7 +18,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -31,7 +31,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -42,7 +42,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -53,7 +53,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -64,7 +64,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -76,7 +76,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -86,7 +86,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -96,7 +96,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -106,7 +106,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -116,7 +116,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - @@ -126,7 +126,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -135,7 +135,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-keystone.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-keystone.yaml index 50cbecff2..bfc9948b3 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-keystone.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-keystone.yaml @@ -3,7 +3,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -12,7 +12,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -21,7 +21,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -30,7 +30,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -39,7 +39,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -48,7 +48,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -57,28 +57,28 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} KeystoneBasic.create_user: - runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} KeystoneBasic.create_tenant: - runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} KeystoneBasic.create_and_list_users: - runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -87,6 +87,6 @@ args: users_per_tenant: 10 runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml index 152c748b3..3cdba95c7 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml @@ -9,7 +9,7 @@ network: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -28,7 +28,7 @@ port: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -51,7 +51,7 @@ router: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -71,7 +71,7 @@ subnet: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -86,7 +86,7 @@ network: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -105,7 +105,7 @@ port: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -127,7 +127,7 @@ router: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -147,7 +147,7 @@ subnet: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -164,7 +164,7 @@ network: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -187,7 +187,7 @@ port: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -212,7 +212,7 @@ router: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -234,7 +234,7 @@ subnet: -1 {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml index d4bddbd89..006491293 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml @@ -15,7 +15,7 @@ {{ unlimited_nova(keypairs=true) }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -27,7 +27,7 @@ {{ unlimited_nova(keypairs=true) }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -39,7 +39,7 @@ {{ unlimited_nova(keypairs=true) }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -68,7 +68,7 @@ {{ unlimited_nova() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -88,7 +88,7 @@ {{ unlimited_nova() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -109,7 +109,7 @@ {{ unlimited_nova() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -133,7 +133,7 @@ {{ unlimited_nova() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -155,7 +155,7 @@ {{ unlimited_nova() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -176,7 +176,7 @@ {{ unlimited_nova() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -196,7 +196,7 @@ {{ unlimited_nova() }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -217,7 +217,7 @@ {{ unlimited_neutron(secgroups=true) }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -230,7 +230,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -242,7 +242,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -256,7 +256,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -269,7 +269,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -285,7 +285,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -300,7 +300,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -315,7 +315,7 @@ {{ unlimited_neutron(secgroups=true) }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -330,7 +330,7 @@ {{ unlimited_neutron(secgroups=true) }} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -347,7 +347,7 @@ network: {} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -364,6 +364,6 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-quotas.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-quotas.yaml index 66fd2039d..a0682acce 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-quotas.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-quotas.yaml @@ -5,7 +5,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -16,7 +16,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -27,7 +27,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -38,7 +38,7 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -49,6 +49,6 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount,times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-requests.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-requests.yaml index b7d2033f2..6affcc6c6 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-requests.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-requests.yaml @@ -11,7 +11,7 @@ method: "GET" status_code: 200 runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -23,6 +23,6 @@ status_code: 200 allow_redirects: False runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml index 17ce20ce1..74f509925 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-vm.yaml @@ -15,7 +15,7 @@ network: {} {% endcall %} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} @@ -37,6 +37,6 @@ context: {{ user_context(tenants_amount, users_amount, use_existing_users) }} runner: - {{ constant_runner(concurrency=2*controllers_amount, times=10*controllers_amount, is_smoke=smoke) }} + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} -- cgit 1.2.3-korg