From 052a1ee6484a1408a3b4fffe4f1f7cf4308d160e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 19 Jan 2018 07:44:57 +0000 Subject: [PATCH] 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 7c4da0c8b8bc6d3cfb10c77511cbb57cf13a7a0e. Also, test nodepool master branch instead of deleted feature/zuulv3 branch. Change-Id: I0b04d251f62efc362a80a7c6fb595e76c4bf3d76 --- test-requirements.txt | 2 +- tox.ini | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index aa4399af39..5b4c2a6207 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 diff --git a/tox.ini b/tox.ini index db6bf1f4f3..08d040c813 100644 --- a/tox.ini +++ b/tox.ini @@ -101,7 +101,10 @@ changedir = {toxinidir}/nodepool commands = env ELEMENTS_DIR=elements dib-lint [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] basepython = python3