Merge "Fix tox.ini to work with ansible 2.2.1.0"
This commit is contained in:
commit
0c7f419ddd
8
tox.ini
8
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"
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user