Merge "Migrate some test cases from scenario to sanity test suite"

roles/tobiko-run/vars/test-workflow-faults-neutron.yaml

@@ -1,17 +1,35 @@
 ---
 
 test_workflow_steps:
+  - tox_description: 'run sanity test cases before creating resources'
+    tox_envlist: neutron_sanity
+    tox_step_name: before
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no
+
   - tox_description: 'create Neutron resources'
     tox_envlist: neutron
     tox_step_name: create_neutron_resources
     tox_environment:
       TOBIKO_PREVENT_CREATE: no
 
+  - tox_description: 'run sanity test cases before disruptive tests'
+    tox_envlist: neutron_sanity
+    tox_step_name: between
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no
+
   - tox_description: 'run disruptive test cases'
     tox_envlist: neutron_faults
     tox_step_name: neutron_faults
     pytest_maxfail: 1
 
+  - tox_description: 'run sanity test cases after disruptive tests'
+    tox_envlist: neutron_sanity
+    tox_step_name: after
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no
+
   - tox_description: 'verify Neutron resources'
     tox_envlist: neutron
     tox_step_name: verify_neutron_resources

roles/tobiko-run/vars/test-workflow-faults.yaml

@@ -1,15 +1,21 @@
 ---
 
 test_workflow_steps:
+  - tox_description: 'run sanity test cases before creating resources'
+    tox_envlist: sanity
+    tox_step_name: before
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no
+
   - tox_description: 'create workload resources'
     tox_envlist: scenario
     tox_step_name: create_resources
     tox_environment:
       TOBIKO_PREVENT_CREATE: no
 
-  - tox_description: 'run sanity test cases before disruptive test cases'
+  - tox_description: 'run sanity test cases before disruptive tests'
     tox_envlist: sanity
-    tox_step_name: before_faults
+    tox_step_name: between
     tox_environment:
       TOBIKO_PREVENT_CREATE: no
 
@@ -20,9 +26,9 @@ test_workflow_steps:
       TOBIKO_PREVENT_CREATE: no
     pytest_maxfail: 1
 
-  - tox_description: 'run sanity test cases after disruptive test cases'
+  - tox_description: 'run sanity test cases after disruptive tests'
     tox_envlist: sanity
-    tox_step_name: after_faults
+    tox_step_name: after
     tox_environment:
       TOBIKO_PREVENT_CREATE: no
 

roles/tobiko-run/vars/test-workflow-minimal.yaml

@@ -0,0 +1,14 @@
+---
+
+test_workflow_steps:
+  - tox_description: 'run sanity test cases before creating resources'
+    tox_envlist: sanity
+    tox_step_name: before
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no
+
+  - tox_description: 'create workload resources'
+    tox_envlist: scenario
+    tox_step_name: create_resources
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no

tobiko/tests/scenario/neutron/test_floating_ip.py

@@ -17,6 +17,7 @@ from __future__ import absolute_import
 import typing
 
 from oslo_log import log
+import pytest
 import testtools
 
 import tobiko
@@ -33,6 +34,7 @@ CONF = config.CONF
 LOG = log.getLogger(__name__)
 
 
+@pytest.mark.minimal
 class FloatingIPTest(testtools.TestCase):
     """Tests connectivity via floating IPs"""
 

tobiko/tests/scenario/neutron/test_network.py

@@ -25,6 +25,7 @@ from tobiko.shell import ping
 from tobiko.shell import sh
 
 
+@pytest.mark.minimal
 class NetworkTest(testtools.TestCase):
 
     #: Resources stack with Nova server to send messages to

tobiko/tests/scenario/neutron/test_port.py

@@ -39,6 +39,7 @@ IPV4 = constants.IP_VERSION_4
 IPV6 = constants.IP_VERSION_6
 
 
+@pytest.mark.minimal
 class PortTest(testtools.TestCase):
     """Test Neutron ports"""
 

tobiko/tests/scenario/neutron/test_router.py

@@ -31,6 +31,7 @@ LOG = log.getLogger(__name__)
 CONF = config.CONF
 
 
+@pytest.mark.minimal
 class RouterTest(testtools.TestCase):
     """Test Neutron routers"""
 

tobiko/tests/scenario/nova/test_server.py

@@ -49,6 +49,7 @@ class CirrosServerStackFixture(stacks.CirrosServerStackFixture):
         return stack
 
 
+@pytest.mark.minimal
 @keystone.skip_unless_has_keystone_credentials()
 class CirrosServerTest(testtools.TestCase):
 

tox.ini

@@ -232,6 +232,16 @@ setenv =
     PYTEST_TIMEOUT = 1800
 
 
+[testenv:neutron_sanity]
+
+basepython = {[integration]basepython}
+envdir = {[integration]envdir}
+passenv = {[integration]passenv}
+setenv =
+    {[testenv:sanity]setenv}
+    OS_TEST_PATH = {toxinidir}/tobiko/tests/sanity/neutron
+
+
 [testenv:faults]
 
 basepython = {[integration]basepython}

zuul.d/project.yaml

@@ -12,6 +12,7 @@
       - devstack-tobiko-neutron
       - devstack-tobiko-nova
       - devstack-tobiko-ovs
+      - devstack-tobiko-sanity
       - devstack-tobiko-storage
       - docs-on-readthedocs
       - openstack-cover-jobs