From 1256b241331a5a6c92f27344e8b2e6305af1d758 Mon Sep 17 00:00:00 2001
From: morenod <dsanzmor@redhat.com>
Date: Tue, 3 Jun 2025 15:04:51 +0200
Subject: [PATCH] Adapt zuul.yaml strategies jobs to include tests with tag
 'strategy'

The idea is to adapt zuul.yaml to future test structure where every strategy will be on its own file so now we keep executing everything inside test_execute_strategies but also any other test on any file with tag 'strategy'

Change-Id: I304c858078d35beb1f7b4f1fad4ea8bedde674af
---
 .zuul.yaml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 67718e324..b71946390 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -9,7 +9,10 @@
     parent: watcher-tempest-multinode
     vars:
       tempest_concurrency: 1
-      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies
+      # All tests inside watcher_tempest_plugin.tests.scenario with tag "strategy"
+      # or test_execute_strategies file
+      # excluding tests with tag "real_load"
+      tempest_test_regex: (^watcher_tempest_plugin.tests.scenario)(.*\[.*\bstrategy\b.*\].*)|(^watcher_tempest_plugin.tests.scenario.test_execute_strategies)
       tempest_exclude_regex: .*\[.*\breal_load\b.*\].*
 
 - job:
@@ -210,7 +213,10 @@
               datasource: prometheus
       tempest_plugins:
         - watcher-tempest-plugin
-      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies
+      # All tests inside watcher_tempest_plugin.tests.scenario with tag "strategy"
+      # or test_execute_strategies file
+      # excluding tests with tag "real_load"
+      tempest_test_regex: (watcher_tempest_plugin.tests.scenario)(.*\[.*\bstrategy\b.*\].*)|(watcher_tempest_plugin.tests.scenario.test_execute_strategies)
       tempest_exclude_regex: .*\[.*\breal_load\b.*\].*
       tempest_concurrency: 1
       tox_envlist: all
@@ -257,7 +263,8 @@
           $TEMPEST_CONFIG:
             optimize:
               datasource: ""
-      tempest_test_regex: .*\[.*\breal_load\b.*\].*
+      # All tests inside watcher_tempest_plugin.tests.scenario with tag "real_load"
+      tempest_test_regex: (^watcher_tempest_plugin.tests.scenario)(.*\[.*\breal_load\b.*\].*)
       tempest_exclude_regex: ""
     group-vars:
       subnode: