Merge "db: Final cleanups"

1 files changed, 2 insertions, 12 deletions

diff --git a/tox.ini b/tox.ini
index 694ecce506..6dfde9afbb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,11 +32,7 @@ passenv =
 # there is also secret magic in subunit-trace which lets you run in a fail only
 # mode. To do this define the TRACE_FAILONLY environmental variable.
 commands =
-# NOTE(gibi): The group-regex runs the matching tests in the same executor.
-# These tests runs against a real mysql instance and in an IO deprived CI VM they tend to time out.
-# See bug https://launchpad.net/bugs/1823251 for details.
-# By running them in the same executor we can spread the IO load of these tests in time.
-  stestr --group-regex=nova\.tests\.unit\.db\.test_migrations\.TestNovaMigrationsMySQL run {posargs}
+  stestr run {posargs}
   env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
   stestr slowest
 
@@ -96,13 +92,7 @@ deps =
   {[testenv]deps}
   openstack-placement>=1.0.0
 commands =
-# NOTE(gibi): The group-regex runs the matching tests in the same executor.
-# These tests runs against a real db instance and in an IO deprived CI VM they tend to time out.
-# See bug https://launchpad.net/bugs/1823251 for details.
-# By running them in the same executor we can spread the IO load of these tests in time.
-# NOTE(gibi): I was not able to group only the mysql tests this way as regex
-# TestNovaAPIMigrations.*MySQL does not do what I expect
-  stestr --group-regex=nova\.tests\.functional\.db\.api\.test_migrations\.TestNovaAPIMigrations --test-path=./nova/tests/functional run {posargs}
+  stestr --test-path=./nova/tests/functional run {posargs}
   stestr slowest
 
 [testenv:functional-py36]