Merge "Simplify tox targets"

tox.ini

@@ -30,7 +30,7 @@ passenv =
     OS_LOG_CAPTURE
     AODH_TEST_DRIVERS
 commands =
-    stestr --test-path=./aodh/tests run
+    stestr --test-path=./aodh/tests run {posargs}
     aodh-config-generator
 allowlist_externals =
     bash
@@ -42,14 +42,11 @@ setenv =
     PYTHON=coverage run --source aodh --parallel-mode
 commands =
     coverage erase
-    stestr run {posargs}
+    stestr --test-path=./aodh/tests run {posargs}
-    stestr --test-path=./aodh/tests/functional run {posargs}
     coverage combine
     coverage html -d cover
     coverage xml -o cover/coverage.xml
     coverage report
-    stestr --test-path=./aodh/tests run
-    coverage report
 
 [testenv:pep8]
 deps = hacking>=6.1.0,<6.2.0
@@ -91,26 +88,6 @@ setenv = PYTHONHASHSEED=0
 [testenv:debug]
 commands = bash -x oslo_debug_helper {posargs}
 
-[testenv:debug-mysql]
-deps =
-  gnocchi[mysql, file]
-  pifpaf[gnocchi]>=1.0.1
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-  .[mysql]
-  -r{toxinidir}/test-requirements.txt
-setenv = OS_TEST_PATH=aodh/tests/functional/
-commands = pifpaf -g AODH_TEST_STORAGE_URL run mysql -- oslo_debug_helper {posargs}
-
-[testenv:debug-pgsql]
-deps =
-  gnocchi[postgresql, file]
-  pifpaf[gnocchi]>=1.0.1
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-  .[postgresql]
-  -r{toxinidir}/test-requirements.txt
-setenv = OS_TEST_PATH=aodh/tests/functional/
-commands = pifpaf -g AODH_TEST_STORAGE_URL run postgresql -- oslo_debug_helper {posargs}
-
 [flake8]
 # W503 line break before binary operator
 # W504 line break after binary operator