From d7e13f5db61a0dcc94a6d748f0312ef668bb7985 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 17 Dec 2020 00:59:09 +0200 Subject: [PATCH] Remove duplicated defenition of tempest_run_concurrency tempest_run_concurrency is defined in user_variables template for bootstrap-host template so no need in setting the same defenition in each project specific template. Change-Id: Ia280e066f2b24a8a038d5ed7851f1dabde237727 --- .../roles/bootstrap-host/templates/user_variables_ironic.yml.j2 | 1 - .../roles/bootstrap-host/templates/user_variables_manila.yml.j2 | 2 -- .../bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 | 1 - .../bootstrap-host/templates/user_variables_octavia.yml.j2 | 1 - 4 files changed, 5 deletions(-) diff --git a/tests/roles/bootstrap-host/templates/user_variables_ironic.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_ironic.yml.j2 index 79a2e2c13a..d55b1f696b 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_ironic.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_ironic.yml.j2 @@ -19,6 +19,5 @@ tempest_test_whitelist: tempest_test_blacklist: - 'ironic_tempest_plugin.tests.api.admin.test_chassis.TestChassis.test_chassis_node_list' -tempest_run_concurrency: 0 tempest_service_available_ironic: true tempest_service_available_neutron: true diff --git a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 index 3c41a183c3..a769b754e4 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 @@ -38,8 +38,6 @@ tempest_test_whitelist: tempest_test_blacklist: - manila_tempest_tests.tests.scenario.test_share_basic_ops.TestShareBasicOpsNFS.test_read_write_two_vms -tempest_run_concurrency: 0 - tempest_tempest_conf_overrides: share: run_consistency_group_tests: False diff --git a/tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 index 3c4fd9a32d..c868f6d637 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_neutron_ovn.yml.j2 @@ -19,7 +19,6 @@ neutron_plugin_base: neutron_ml2_drivers_type: "geneve,vlan,flat" -tempest_run_concurrency: 0 tempest_plugins: - name: neutron-tempest-plugin repo: https://opendev.org/openstack/neutron-tempest-plugin diff --git a/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 index d56495e6a3..41595df60b 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 @@ -23,7 +23,6 @@ octavia_ssh_enabled: True octavia_legacy_policy: True octavia_amp_vcpu: 2 octavia_amp_ram: 512 -tempest_run_concurrency: 0 tempest_service_available_octavia: true tempest_tempest_conf_overrides: load_balancer: