Merge "Add special serial smoke option"
diff --git a/tox.ini b/tox.ini
index a3c781b..268f7e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -83,6 +83,14 @@
 commands =
    sh tools/pretty_tox_serial.sh '(?!.*\[.*\bslow\b.*\])((smoke)|(^tempest\.scenario)) {posargs}'
 
+[testenv:smoke-serial]
+sitepackages = True
+# This is still serial because neutron doesn't work with parallel. See:
+# https://bugs.launchpad.net/tempest/+bug/1216076 so the neutron smoke
+# job would fail if we moved it to parallel.
+commands =
+   sh tools/pretty_tox_serial.sh '(?!.*\[.*\bslow\b.*\])((smoke)|(^tempest\.scenario)) {posargs}'
+
 [testenv:coverage]
 sitepackages = True
 commands =