From 021f18905f30468c49e3652682403f12eeb04a6e Mon Sep 17 00:00:00 2001 From: Damian Dabrowski Date: Mon, 4 Jul 2022 15:48:52 +0200 Subject: [PATCH] Make _tempest_plugins a list of dicts. For some reason we define a list inside a _tempest_plugins dict. It should be simplified to the list of dicts. Change-Id: I891f77e3e22c962615697504d0870e25017511d7 --- defaults/main.yml | 16 +-- tests/os_tempest-overrides.yml | 1 + vars/main.yml | 180 +++++++++++++++------------------ 3 files changed, 90 insertions(+), 107 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ee83a1cd..ebb1f429 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -90,13 +90,15 @@ tempest_log_dir: "/var/log/tempest" # By default, the following tempest plugins are installed. # Override ``tempest_plugins`` variable with your own plugins, depending # on your installation. -# The structure of each item of the list is the following: -# - name: designate-tempest-plugin #name of the plugin -# repo: https://opendev.org/openstack/designate-tempest-plugin #for installing the plugin from sources -# branch: master #for installing the plugin from sources -# - name: ironic-tempest-plugin -# package: ironic #for installing the plugin from packages -tempest_plugins: "{{ _tempest_plugins.values() | sum(start=[]) | selectattr('install', 'equalto', true) | list }}" +# Example structure: +# - name: designate-tempest-plugin #name of the plugin +# repo: https://opendev.org/openstack/designate-tempest-plugin #for installing the plugin from sources +# branch: master #for installing the plugin from sources +# install: true +# - name: ironic-tempest-plugin +# package: ironic #for installing the plugin from packages +# install: true +tempest_plugins: "{{ _tempest_plugins | selectattr('install', 'equalto', true) }}" tempest_plugin_barbican_git_repo: https://opendev.org/openstack/barbican-tempest-plugin tempest_plugin_barbican_git_install_branch: master diff --git a/tests/os_tempest-overrides.yml b/tests/os_tempest-overrides.yml index f592dabe..c67ecbee 100644 --- a/tests/os_tempest-overrides.yml +++ b/tests/os_tempest-overrides.yml @@ -24,6 +24,7 @@ tempest_plugins: - name: sahara-tests repo: https://opendev.org/openstack/sahara-tests branch: master + install: true neutron_provider_networks: network_types: "vxlan,flat" diff --git a/vars/main.yml b/vars/main.yml index 80ccdf52..9747a20a 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -51,103 +51,83 @@ tempest_images_map: # install: # boolean to enable/disable the installation of this item _tempest_plugins: - barbican: - - name: barbican-tempest-plugin - repo: "{{ tempest_plugin_barbican_git_repo }}" - branch: "{{ tempest_plugin_barbican_git_install_branch }}" - install: "{{ tempest_service_available_barbican | bool }}" - cinder: - - name: cinder-tempest-plugin - repo: "{{ tempest_plugin_cinder_git_repo }}" - branch: "{{ tempest_plugin_cinder_git_install_branch }}" - install: "{{ tempest_service_available_cinder | bool }}" - cloudkitty: - - name: cloudkitty-tempest-plugin - repo: "{{ tempest_plugin_cloudkitty_git_repo }}" - branch: "{{ tempest_plugin_cloudkitty_git_install_branch }}" - install: "{{ tempest_service_available_cloudkitty | bool }}" - designate: - - name: designate-tempest-plugin - repo: "{{ tempest_plugin_designate_git_repo }}" - branch: "{{ tempest_plugin_designate_git_install_branch }}" - install: "{{ tempest_service_available_designate | bool }}" - glance: - - name: glance-tempest-plugin - repo: "{{ tempest_plugin_glance_git_repo }}" - branch: "{{ tempest_plugin_glance_git_install_branch }}" - install: "{{ tempest_service_available_glance | bool }}" - heat: - - name: heat-tempest-plugin - repo: "{{ tempest_plugin_heat_git_repo }}" - branch: "{{ tempest_plugin_heat_git_install_branch }}" - install: "{{ tempest_service_available_heat | bool }}" - ironic: - - name: ironic-tempest-plugin - repo: "{{ tempest_plugin_ironic_git_repo }}" - branch: "{{ tempest_plugin_ironic_git_install_branch }}" - install: "{{ tempest_service_available_ironic | bool }}" - keystone: - - name: keystone-tempest-plugin - repo: "{{ tempest_plugin_keystone_git_repo }}" - branch: "{{ tempest_plugin_keystone_git_install_branch }}" - install: yes - magnum: - - name: magnum-tempest-plugin - repo: "{{ tempest_plugin_magnum_git_repo }}" - branch: "{{ tempest_plugin_magnum_git_install_branch }}" - install: "{{ tempest_service_available_magnum | bool }}" - manila: - - name: manila-tempest-plugin - repo: "{{ tempest_plugin_manila_git_repo }}" - branch: "{{ tempest_plugin_manila_git_install_branch }}" - install: "{{ tempest_service_available_manila | bool }}" - murano: - - name: murano-tempest-plugin - repo: "{{ tempest_plugin_murano_git_repo }}" - branch: "{{ tempest_plugin_murano_git_install_branch }}" - install: "{{ tempest_service_available_murano | bool }}" - neutron: - - name: neutron-tempest-plugin - repo: "{{ tempest_plugin_neutron_git_repo }}" - branch: "{{ tempest_plugin_neutron_git_install_branch }}" - install: "{{ tempest_service_available_neutron or tempest_service_available_neutron_bgpvpn or tempest_service_available_neutron_vpnaas }}" - novajoin: - - name: novajoin-tempest-plugin - repo: "{{ tempest_plugin_novajoin_git_repo }}" - branch: "{{ tempest_plugin_novajoin_git_install_branch }}" - install: "{{ tempest_service_available_novajoin | bool }}" - octavia: - - name: octavia-tempest-plugin - repo: "{{ tempest_plugin_octavia_git_repo }}" - branch: "{{ tempest_plugin_octavia_git_install_branch }}" - install: "{{ tempest_service_available_octavia | bool }}" - senlin: - - name: senlin-tempest-plugin - repo: "{{ tempest_plugin_senlin_git_repo }}" - branch: "{{ tempest_plugin_senlin_git_install_branch }}" - install: "{{ tempest_service_available_senlin | bool }}" - sahara: - - name: sahara-tests - repo: "{{ tempest_plugin_sahara_git_repo }}" - branch: "{{ tempest_plugin_sahara_git_install_branch }}" - install: "{{ tempest_service_available_sahara | bool }}" - telemetry: - - name: telemetry-tempest-plugin - repo: "{{ tempest_plugin_telemetry_git_repo }}" - branch: "{{ tempest_plugin_telemetry_git_install_branch }}" - install: "{{ (tempest_service_available_aodh | bool) or (tempest_service_available_ceilometer | bool) or (tempest_service_available_gnocchi | bool) or (tempest_service_available_panko | bool) }}" - trove: - - name: trove-tempest-plugin - repo: "{{ tempest_plugin_trove_git_repo }}" - branch: "{{ tempest_plugin_trove_git_install_branch }}" - install: "{{ tempest_service_available_trove | bool }}" - zaqar: - - name: zaqar-tempest-plugin - repo: "{{ tempest_plugin_zaqar_git_repo }}" - branch: "{{ tempest_plugin_zaqar_git_install_branch }}" - install: "{{ tempest_service_available_zaqar | bool }}" - zun: - - name: zun-tempest-plugin - repo: "{{ tempest_plugin_zun_git_repo }}" - branch: "{{ tempest_plugin_zun_git_install_branch }}" - install: "{{ tempest_service_available_zun | bool }}" + - name: barbican-tempest-plugin + repo: "{{ tempest_plugin_barbican_git_repo }}" + branch: "{{ tempest_plugin_barbican_git_install_branch }}" + install: "{{ tempest_service_available_barbican | bool }}" + - name: cinder-tempest-plugin + repo: "{{ tempest_plugin_cinder_git_repo }}" + branch: "{{ tempest_plugin_cinder_git_install_branch }}" + install: "{{ tempest_service_available_cinder | bool }}" + - name: cloudkitty-tempest-plugin + repo: "{{ tempest_plugin_cloudkitty_git_repo }}" + branch: "{{ tempest_plugin_cloudkitty_git_install_branch }}" + install: "{{ tempest_service_available_cloudkitty | bool }}" + - name: designate-tempest-plugin + repo: "{{ tempest_plugin_designate_git_repo }}" + branch: "{{ tempest_plugin_designate_git_install_branch }}" + install: "{{ tempest_service_available_designate | bool }}" + - name: glance-tempest-plugin + repo: "{{ tempest_plugin_glance_git_repo }}" + branch: "{{ tempest_plugin_glance_git_install_branch }}" + install: "{{ tempest_service_available_glance | bool }}" + - name: heat-tempest-plugin + repo: "{{ tempest_plugin_heat_git_repo }}" + branch: "{{ tempest_plugin_heat_git_install_branch }}" + install: "{{ tempest_service_available_heat | bool }}" + - name: ironic-tempest-plugin + repo: "{{ tempest_plugin_ironic_git_repo }}" + branch: "{{ tempest_plugin_ironic_git_install_branch }}" + install: "{{ tempest_service_available_ironic | bool }}" + - name: keystone-tempest-plugin + repo: "{{ tempest_plugin_keystone_git_repo }}" + branch: "{{ tempest_plugin_keystone_git_install_branch }}" + install: yes + - name: magnum-tempest-plugin + repo: "{{ tempest_plugin_magnum_git_repo }}" + branch: "{{ tempest_plugin_magnum_git_install_branch }}" + install: "{{ tempest_service_available_magnum | bool }}" + - name: manila-tempest-plugin + repo: "{{ tempest_plugin_manila_git_repo }}" + branch: "{{ tempest_plugin_manila_git_install_branch }}" + install: "{{ tempest_service_available_manila | bool }}" + - name: murano-tempest-plugin + repo: "{{ tempest_plugin_murano_git_repo }}" + branch: "{{ tempest_plugin_murano_git_install_branch }}" + install: "{{ tempest_service_available_murano | bool }}" + - name: neutron-tempest-plugin + repo: "{{ tempest_plugin_neutron_git_repo }}" + branch: "{{ tempest_plugin_neutron_git_install_branch }}" + install: "{{ tempest_service_available_neutron or tempest_service_available_neutron_bgpvpn or tempest_service_available_neutron_vpnaas }}" + - name: novajoin-tempest-plugin + repo: "{{ tempest_plugin_novajoin_git_repo }}" + branch: "{{ tempest_plugin_novajoin_git_install_branch }}" + install: "{{ tempest_service_available_novajoin | bool }}" + - name: octavia-tempest-plugin + repo: "{{ tempest_plugin_octavia_git_repo }}" + branch: "{{ tempest_plugin_octavia_git_install_branch }}" + install: "{{ tempest_service_available_octavia | bool }}" + - name: senlin-tempest-plugin + repo: "{{ tempest_plugin_senlin_git_repo }}" + branch: "{{ tempest_plugin_senlin_git_install_branch }}" + install: "{{ tempest_service_available_senlin | bool }}" + - name: sahara-tests + repo: "{{ tempest_plugin_sahara_git_repo }}" + branch: "{{ tempest_plugin_sahara_git_install_branch }}" + install: "{{ tempest_service_available_sahara | bool }}" + - name: telemetry-tempest-plugin + repo: "{{ tempest_plugin_telemetry_git_repo }}" + branch: "{{ tempest_plugin_telemetry_git_install_branch }}" + install: "{{ (tempest_service_available_aodh | bool) or (tempest_service_available_ceilometer | bool) or (tempest_service_available_gnocchi | bool) or (tempest_service_available_panko | bool) }}" + - name: trove-tempest-plugin + repo: "{{ tempest_plugin_trove_git_repo }}" + branch: "{{ tempest_plugin_trove_git_install_branch }}" + install: "{{ tempest_service_available_trove | bool }}" + - name: zaqar-tempest-plugin + repo: "{{ tempest_plugin_zaqar_git_repo }}" + branch: "{{ tempest_plugin_zaqar_git_install_branch }}" + install: "{{ tempest_service_available_zaqar | bool }}" + - name: zun-tempest-plugin + repo: "{{ tempest_plugin_zun_git_repo }}" + branch: "{{ tempest_plugin_zun_git_install_branch }}" + install: "{{ tempest_service_available_zun | bool }}"