openstack/openstack-ansible
Code Issues Proposed changes

Merge "Simplify handling of 'telemetry' scenario in CI tests"

Browse Source
This commit is contained in:
Zuul 2024-08-28 10:12:37 +00:00 committed by Gerrit Code Review
commit dc15f3e98b
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/roles/bootstrap-host/vars/main.yml
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 %}

8
zuul.d/playbooks/pre-gate-scenario.yml
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') %}