From 64fb3b0b92653b60c065926984cda1e5c883898d Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 15 Jul 2024 14:52:10 +0100 Subject: [PATCH] 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 --- tests/roles/bootstrap-host/vars/main.yml | 3 ++- zuul.d/jobs.yaml | 15 ++++++++------- zuul.d/playbooks/pre-gate-scenario.yml | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/roles/bootstrap-host/vars/main.yml b/tests/roles/bootstrap-host/vars/main.yml index 52230555b1..ef624b202e 100644 --- a/tests/roles/bootstrap-host/vars/main.yml +++ b/tests/roles/bootstrap-host/vars/main.yml @@ -44,7 +44,8 @@ bootstrap_host_scenarios_expanded: |- {% if 'cloudkitty' in bootstrap_host_scenarios %} {% set _ = scenario_list.extend(['ceilometer', 'gnocchi']) %} {% 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']) %} {% endif %} {% if 'ironic' in bootstrap_host_scenarios %} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 75f5f1c26b..1588f7e4d6 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -334,13 +334,14 @@ name: openstack-ansible-deploy-infra_lxc-validate parent: openstack-ansible-deploy-infra_lxc-ubuntu-jammy files: - - ^playbooks\/galera-install.yml - - ^playbooks\/rabbitmq-install.yml - - ^playbooks\/memcached-install.yml - - ^playbooks\/healthcheck-infrastructure.yml - - ^playbooks\/repo-install.yml - - ^playbooks\/haproxy-install.yml - - ^playbooks\/zookeeper-install.yml + - ^playbooks\/galera(-install)?\.yml + - ^playbooks\/rabbitmq(-install)?\.yml + - ^playbooks\/memcached(-install)?\.yml + - ^playbooks\/healthcheck-infrastructure\.yml + - ^playbooks\/repo(-install|_server)\.yml + - ^playbooks\/haproxy(-install)?\.yml + - ^playbooks\/utility(-install|_host)\.yml + - ^playbooks\/zookeeper-(-install)?\.yml # Running linters check - job: diff --git a/zuul.d/playbooks/pre-gate-scenario.yml b/zuul.d/playbooks/pre-gate-scenario.yml index 85539ab721..8de3830e53 100644 --- a/zuul.d/playbooks/pre-gate-scenario.yml +++ b/zuul.d/playbooks/pre-gate-scenario.yml @@ -50,6 +50,8 @@ {% set role_service_name = 'hardening' %} {% elif zuul.project.short_name == 'openstack-ansible' %} {% set role_service_name = 'integrated' %} + {% elif zuul.project.short_name == 'openstack-ansible-plugins' %} + {% set role_service_name = 'plugins' %} {% endif %} {% if role_service_name is defined %} {% set _ = _scenario.append(role_service_name) %}