openstack
/
openstack-ansible-os_swift
Code Issues Proposed changes

Fix tox.ini to work with ansible 2.2.1.0 

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: If9c64f7f1525939aa1bcbccef94752852e975ec8
This commit is contained in:
Andy McCrae 2017-01-18 17:38:47 +00:00
parent 05ce3a6bd5
commit c02bf40395
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tox.ini
View File

@ -59,6 +59,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]
@ -118,10 +122,6 @@ setenv =
ANSIBLE_PARAMETERS=-vvv -e swift_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"