diff --git a/tox.ini b/tox.ini index 2cd8533f4410..eab7709d7444 100644 --- a/tox.ini +++ b/tox.ini @@ -74,17 +74,22 @@ commands = basepython = python2.7 setenv = {[testenv]setenv} # As nova functional tests import the PlacementFixture from the placement -# repository these tests are, by default, set up to run with latest master from -# the placement repo. In the gate, Zuul will clone the latest master from -# placement OR the version of placement the Depends-On in the commit message -# suggests. If you want to run the test locally with an un-merged placement -# change, modify this line locally to point to your dependency or pip install -# placement into the appropriate tox virtualenv. We express the requirement -# here instead of test-requirements because we do not want placement present -# during unit tests. +# repository these tests are, by default, set up to run with openstack-placement +# from pypi. In the gate, Zuul will use the installed version of placement (stable +# branch version on stable gate run) OR the version of placement the Depends-On in +# the commit message suggests. If you want to run the tests with latest master from +# the placement repo, modify the dep line to point at master, example: +# deps = +# -r{toxinidir}/test-requirements.txt +# git+https://opendev.org/openstack/placement#egg=openstack-placement +# If you want to run the test locally with an un-merged placement change, +# modify the dep line to point to your dependency or pip install placement +# into the appropriate tox virtualenv. +# NOTE: We express the requirement here instead of test-requirements +# because we do not want placement present during unit tests. deps = -r{toxinidir}/test-requirements.txt - git+https://opendev.org/openstack/placement#egg=openstack-placement + openstack-placement>=1.0.0 commands = # NOTE(cdent): The group_regex describes how stestr will group tests into the # same process when running concurently. The following ensures that gabbi tests