From c02bf403959b797e36eac760df758469b09a804a Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Wed, 18 Jan 2017 17:38:47 +0000 Subject: [PATCH] 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 --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 68f61014..ba44d2f6 100644 --- a/tox.ini +++ b/tox.ini @@ -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"