Partial revert "Revert "Remove diskimages section from nodepool-launchers""

Add back in tox.ini changes to test all versions of nodepool.yaml files.

This reverts partially commit 7c4da0c8b8.

Also, test nodepool master branch instead of deleted feature/zuulv3
branch.

Change-Id: I0b04d251f62efc362a80a7c6fb595e76c4bf3d76
This commit is contained in:
Andreas Jaeger 2018-01-19 07:44:57 +00:00 committed by Andreas Jaeger
parent 6adbc07012
commit 052a1ee648
2 changed files with 5 additions and 2 deletions

View File

@ -1 +1 @@
-e git+https://git.openstack.org/openstack-infra/nodepool@feature/zuulv3#egg=nodepool -e git+https://git.openstack.org/openstack-infra/nodepool#egg=nodepool

View File

@ -101,7 +101,10 @@ changedir = {toxinidir}/nodepool
commands = env ELEMENTS_DIR=elements dib-lint commands = env ELEMENTS_DIR=elements dib-lint
[testenv:nodepool] [testenv:nodepool]
commands = nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate commands =
nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate
nodepool -c {toxinidir}/nodepool/nl01.openstack.org.yaml config-validate
nodepool -c {toxinidir}/nodepool/nl02.openstack.org.yaml config-validate
[testenv:add-projects-to-main] [testenv:add-projects-to-main]
basepython = python3 basepython = python3