Merge "Adapt zuul.yaml strategies jobs to include tests with tag 'strategy'"

.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: