From 991d24afb01663dfb8a06a97b604d1d1990c15e6 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 12 Sep 2023 14:48:10 +0100 Subject: [PATCH] Define tempest config overrides in unique variables per service Enabling a complex AIO scenario will result in many definitions of tempest_tempest_conf_overrides and only one will actually be applied in accordance with ansible variable precedence. This patch allows the final content passed to tempest to be composed from many variables simultaneously. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_tempest/+/894757 Change-Id: I9095e61d80ed51f1c60e8838d376c9cded6adbe6 --- tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 | 2 +- .../bootstrap-host/templates/user_variables_horizon.yml.j2 | 2 +- .../roles/bootstrap-host/templates/user_variables_magnum.yml.j2 | 2 +- .../roles/bootstrap-host/templates/user_variables_manila.yml.j2 | 2 +- .../roles/bootstrap-host/templates/user_variables_murano.yml.j2 | 2 +- .../bootstrap-host/templates/user_variables_octavia.yml.j2 | 2 +- tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index f3b3a37789..6e6197cdc8 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -153,7 +153,7 @@ tempest_test_includelist: - "neutron_tempest_plugin.api.test_networks*" - "tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops" -tempest_tempest_conf_overrides: +tempest_tempest_conf_overrides_neutron: network-feature-enabled: api_extensions: agent,allowed-address-pairs,binding,dhcp_agent_scheduler,ext-gw-mode,external-net,extra_dhcp_opt,extra_dhcp_optagent,extraroute,l3_agent_scheduler,metering,provider,quotas,router,security-group,service-type,subnet_allocation {% endif %} diff --git a/tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2 index 6c5b8ded9e..dccdf03b74 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2 @@ -16,6 +16,6 @@ tempest_test_includelist: - tempest.scenario.test_dashboard_basic_ops.TestDashboardBasicOps -tempest_tempest_conf_overrides: +tempest_tempest_conf_overrides_horizon: dashboard: disable_ssl_certificate_validation: True diff --git a/tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2 index 08c4dbcb34..b60c384c3d 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2 @@ -58,7 +58,7 @@ tempest_test_excludelist: - magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_nonexisting_flavor - magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_zero_nodes -tempest_tempest_conf_overrides: +tempest_tempest_conf_overrides_magnum: magnum: coe: kubernetes network_driver: flannel 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 0c494f1acb..1fa6a38f91 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 @@ -30,7 +30,7 @@ tempest_flavors: tempest_test_includelist: - manila_tempest_tests.tests.scenario.test_share_basic_ops.TestShareBasicOpsNFS.test_mount_share_one_vm -tempest_tempest_conf_overrides: +tempest_tempest_conf_overrides_manila: share: # The first version of manila api which supports microversions min_api_microversion: "2.0" diff --git a/tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2 index dbefaee0af..d502ccf78d 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2 @@ -16,7 +16,7 @@ tempest_test_includelist: - murano_tempest_tests.tests.api.application_catalog.test_services -tempest_tempest_conf_overrides: +tempest_tempest_conf_overrides_murano: application_catalog: deployment_tests: True endpoint_type: internalURL 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 5a2d96d552..e0c47fc6a3 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2 @@ -27,7 +27,7 @@ octavia_legacy_policy: True octavia_amp_vcpu: 2 octavia_amp_ram: 512 tempest_service_available_octavia: true -tempest_tempest_conf_overrides: +tempest_tempest_conf_overrides_octavia: load_balancer: member_role: '"Member"' test_with_ipv6: false diff --git a/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 index b2008fb03b..006b8d823a 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 @@ -24,6 +24,6 @@ tempest_test_excludelist: - test: zun_tempest_plugin.tests.tempest.api.test_containers.TestContainer.test_run_container_with_cinder_volume_dynamic_created reason: Cinder volume error -tempest_tempest_conf_overrides: +tempest_tempest_conf_overrides_zun: container_service: min_microversion: 1.27