Improve regex matching for infra_lxc_validate job

* Properly match '.' characters with escaping
* Allow playbooks foo-bar.yml and foo_bar.yml to match

Two schemes for playbook naming should support moving
playbooks to the osa plugins collection, where the symbol "-"
is not allowed in playbook names.

Needed-By: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/924156
Change-Id: I53133b29d65f52d13e13855c7966521422a4b86a
This commit is contained in:
Jonathan Rosser 2024-07-15 14:52:10 +01:00
parent 76ae79d9cd
commit 64fb3b0b92
3 changed files with 12 additions and 8 deletions

View File

@ -44,7 +44,8 @@ bootstrap_host_scenarios_expanded: |-
{% if 'cloudkitty' in bootstrap_host_scenarios %} {% if 'cloudkitty' in bootstrap_host_scenarios %}
{% set _ = scenario_list.extend(['ceilometer', 'gnocchi']) %} {% set _ = scenario_list.extend(['ceilometer', 'gnocchi']) %}
{% endif %} {% endif %}
{% if 'designate' in bootstrap_host_scenarios or ('validate' in bootstrap_host_scenarios and 'integrated' in bootstrap_host_scenarios) %} {% if 'designate' in bootstrap_host_scenarios or
('validate' in bootstrap_host_scenarios and ('integrated' in bootstrap_host_scenarios or 'plugins' in bootstrap_host_scenarios)) %}
{% set _ = scenario_list.extend(['zookeeper']) %} {% set _ = scenario_list.extend(['zookeeper']) %}
{% endif %} {% endif %}
{% if 'ironic' in bootstrap_host_scenarios %} {% if 'ironic' in bootstrap_host_scenarios %}

View File

@ -334,13 +334,14 @@
name: openstack-ansible-deploy-infra_lxc-validate name: openstack-ansible-deploy-infra_lxc-validate
parent: openstack-ansible-deploy-infra_lxc-ubuntu-jammy parent: openstack-ansible-deploy-infra_lxc-ubuntu-jammy
files: files:
- ^playbooks\/galera-install.yml - ^playbooks\/galera(-install)?\.yml
- ^playbooks\/rabbitmq-install.yml - ^playbooks\/rabbitmq(-install)?\.yml
- ^playbooks\/memcached-install.yml - ^playbooks\/memcached(-install)?\.yml
- ^playbooks\/healthcheck-infrastructure.yml - ^playbooks\/healthcheck-infrastructure\.yml
- ^playbooks\/repo-install.yml - ^playbooks\/repo(-install|_server)\.yml
- ^playbooks\/haproxy-install.yml - ^playbooks\/haproxy(-install)?\.yml
- ^playbooks\/zookeeper-install.yml - ^playbooks\/utility(-install|_host)\.yml
- ^playbooks\/zookeeper-(-install)?\.yml
# Running linters check # Running linters check
- job: - job:

View File

@ -50,6 +50,8 @@
{% set role_service_name = 'hardening' %} {% set role_service_name = 'hardening' %}
{% elif zuul.project.short_name == 'openstack-ansible' %} {% elif zuul.project.short_name == 'openstack-ansible' %}
{% set role_service_name = 'integrated' %} {% set role_service_name = 'integrated' %}
{% elif zuul.project.short_name == 'openstack-ansible-plugins' %}
{% set role_service_name = 'plugins' %}
{% endif %} {% endif %}
{% if role_service_name is defined %} {% if role_service_name is defined %}
{% set _ = _scenario.append(role_service_name) %} {% set _ = _scenario.append(role_service_name) %}