Merge "Don't run some of the stateless SG tests in ovn migration workflow"

pytest.ini

@@ -4,6 +4,7 @@ render_collapsed = True
 markers =
   ovn_migration: test cases for testing OVN migration
   minimal: most relevant and lightweight test cases
+  skip_during_ovn_migration: test cases which shouldn't be run in the OVS to OVN migration jobs
 
 
 # rp_uuid = 887ab577-b89e-4b12-9d8f-03f7a0a5b14a

tobiko/tests/scenario/neutron/test_security_groups.py

@@ -18,6 +18,7 @@ import json
 import typing
 
 from oslo_log import log
+import pytest
 import testtools
 
 import tobiko
@@ -285,6 +286,7 @@ class CirrosServerWithStatelessSecurityGroupFixture(
         return [self.security_groups_stack.security_group_id]
 
 
+@pytest.mark.skip_during_ovn_migration
 @neutron.skip_if_missing_networking_extensions('stateful-security-group')
 class StatelessSecurityGroupInstanceTest(BaseSecurityGroupTest):
 

tox.ini

@@ -219,8 +219,8 @@ envdir = {[integration]envdir}
 passenv = {[integration]passenv}
 setenv =
     {[testenv:scenario]setenv}
-    RUN_TESTS_EXTRA_ARGS = -m ovn_migration {env:OS_TEST_PATH}
-
+    OS_TEST_PATH = {toxinidir}/tobiko/tests/scenario
+    RUN_TESTS_EXTRA_ARGS = -m "not skip_during_ovn_migration" {env:OS_TEST_PATH}
 
 [testenv:nova]