From 0e92e00777759348f710433b9c85e7d87289798e Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 17 May 2023 16:22:04 +0200 Subject: [PATCH] Populate scenario properly in CI for N-2 upgrade job After adding upgrade_yoga job, I have missed to adjust regexp to parse SCENARIO properly. Due to that, infra jobs were attempting to run aio_lxc upgrade job rather then just infra. Change-Id: I7215b9c43ccd539f117787a510078368ba7034cf --- zuul.d/playbooks/pre-gate-scenario.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zuul.d/playbooks/pre-gate-scenario.yml b/zuul.d/playbooks/pre-gate-scenario.yml index c142bcec38..85539ab721 100644 --- a/zuul.d/playbooks/pre-gate-scenario.yml +++ b/zuul.d/playbooks/pre-gate-scenario.yml @@ -31,10 +31,10 @@ {% set _scenario = [] %} {# Add the scenarios based on the job name #} {# ex. openstack-ansible-deploy-$scenario1_$scenario2-$os #} - {% if zuul.job is match('^openstack-ansible-(deploy|upgrade)-([^-]+)-.*$') %} + {% if zuul.job is match('^openstack-ansible-(deploy|upgrade_?[a-z,0-9,.]*)-([^-]+)-.*$') %} {% set _ = _scenario.extend( (zuul.job | - regex_replace('^openstack-ansible-[a-z]*-([^-]+)-.*$', '\\1')).split('_') + regex_replace('^openstack-ansible-[a-z,0-9,.,_]*-([^-]+)-.*$', '\\1')).split('_') ) %} {# If testing a role, add the role service name to the scenario list #}