diff --git a/tox.ini b/tox.ini index c944221..8184cf4 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,6 @@ envlist = black, pylint, flake8, py{26,27,36,37,38}, - molecule_{lint,syntax,test}, extra skipsdist = true skip_missing_interpreters = true @@ -155,7 +154,7 @@ commands = # jmespath # selinux # -[molecule] +[molecule_common] deps = docker molecule @@ -164,7 +163,7 @@ deps = [testenv:molecule_lint] envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule} deps = - {[molecule]deps} + {[molecule_common]deps} commands_pre = molecule --version ansible --version @@ -174,17 +173,28 @@ commands = [testenv:molecule_syntax] envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule} deps = - {[molecule]deps} + {[molecule_common]deps} commands = molecule syntax -s {env:LSR_MSCENARIO:default} {posargs} [testenv:molecule_test] envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule} deps = - {[molecule]deps} + {[molecule_common]deps} commands = molecule test -s {env:LSR_MSCENARIO:default} {posargs} +[testenv:molecule] +envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule} +deps = + {[molecule_common]deps} +commands_pre = + {[molecule_lint]commands_pre} +commands = + {[molecule_lint]commands} + {[molecule_syntax]commands} + {[molecule_test]commands} + # Here we provide a way how a role can add its custom command to be run. Such # extra command is run at the end of each testenv run and is driven by # environment variables. Involved environment variables are: