From a0714bf9a99cc37d5276e9e6359eb0c32e955b86 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 13 Aug 2024 14:16:00 +0100 Subject: [PATCH] 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 --- tests/roles/bootstrap-host/vars/main.yml | 2 +- zuul.d/playbooks/pre-gate-scenario.yml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/roles/bootstrap-host/vars/main.yml b/tests/roles/bootstrap-host/vars/main.yml index ef624b202e..380e78c215 100644 --- a/tests/roles/bootstrap-host/vars/main.yml +++ b/tests/roles/bootstrap-host/vars/main.yml @@ -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 %} diff --git a/zuul.d/playbooks/pre-gate-scenario.yml b/zuul.d/playbooks/pre-gate-scenario.yml index 8de3830e53..692e5669af 100644 --- a/zuul.d/playbooks/pre-gate-scenario.yml +++ b/zuul.d/playbooks/pre-gate-scenario.yml @@ -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') %}