Simplify handling of 'telemetry' scenario in CI tests

Reduce the amount of logic in the pre-gate-scenario playbook and
keep it all together in the bootstrap-host role.

Change-Id: I83fda9cfceabb14c2fb471059a76a8add6714b72
This commit is contained in:
Jonathan Rosser 2024-08-13 14:16:00 +01:00
parent 80c1433305
commit a0714bf9a9
2 changed files with 1 additions and 9 deletions

View File

@ -60,7 +60,7 @@ bootstrap_host_scenarios_expanded: |-
{% if 'murano' in bootstrap_host_scenarios %}
{% set _ = scenario_list.extend(['heat']) %}
{% endif %}
{% if 'telemetry' in bootstrap_host_scenarios %}
{% if ['telemetry', 'aodh', 'ceilometer', 'gnocchi'] | intersect(bootstrap_host_scenarios) | length > 0 %}
{% set _ = scenario_list.extend(['aodh', 'ceilometer', 'gnocchi']) %}
{% endif %}
{% if 'translations' in bootstrap_host_scenarios %}

View File

@ -16,10 +16,6 @@
- name: Calculate the dynamic OSA gate scenario
hosts: all[0]
vars:
scenario_map:
aodh: telemetry
ceilometer: telemetry
gnocchi: telemetry
install_methods:
- distro
- source
@ -55,10 +51,6 @@
{% endif %}
{% if role_service_name is defined %}
{% set _ = _scenario.append(role_service_name) %}
{# Add special scenarios based on the project name #}
{% if role_service_name in scenario_map %}
{% set _ = _scenario.append(scenario_map[role_service_name]) %}
{% endif %}
{% endif %}
{% endif %}
{% if zuul.job is match('^openstack-ansible-(deploy|upgrade)-([^-]+)-validate') %}