Skip to content

Commit

Permalink
Fix tox.ini to work with ansible 2.2.1.0
Browse files Browse the repository at this point in the history
Ansible 2.2.1.0 requires included vars files to exist even if the
task/play that includes the file is never run (based on a conditional).

This patch fixes that by ensuring the "upgrade" previous version of
test-vars is fetched for every test.

Change-Id: Ife6dd4a0488765cc9ffd74f11cf8a519d213ea48
  • Loading branch information
andymcc committed Jan 18, 2017
1 parent ca8849b commit a05a804
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ commands =
bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \
git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \
fi"
bash -c "if [ ! -d "{toxinidir}/tests/common/previous" ]; then \
git clone https://git.openstack.org/openstack/openstack-ansible-tests -b stable/newton \
{toxinidir}/tests/common/previous; \
fi"


[testenv:pep8]
Expand Down Expand Up @@ -118,10 +122,6 @@ setenv =
ANSIBLE_PARAMETERS=-vvv -e nova_upgrade=True
commands =
{[testenv:tests_clone]commands}
bash -c "if [ ! -d "{toxinidir}/tests/common/previous" ]; then \
git clone https://git.openstack.org/openstack/openstack-ansible-tests -b stable/newton \
{toxinidir}/tests/common/previous; \
fi"
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"


Expand Down

0 comments on commit a05a804

Please sign in to comment.