Merge pull request #2090 from ceph/ansible-2.4

[skip ci] Test ansible 2.4.1
2017-10-27 17:39:05 +02:00 · 2017-10-27 17:39:05 +02:00 · b3c9de90f4
parent faccd0acf0 c4ad247718
commit b3c9de90f4
2 changed files with 3 additions and 3 deletions
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@ -1,5 +1,4 @@
 # These are Python requirements needed to run the functional tests
-# 1.6.1 fails with 'testinfra is in an unsupported or invalid wheel'
-# see https://github.com/philpep/testinfra/issues/201
-testinfra==1.6.0
+# testinfra < 1.7.1 does not work Ansible 2.4, see https://github.com/philpep/testinfra/issues/249
+testinfra==1.7.1
 pytest-xdist
--- a/tox.ini
+++ b/tox.ini
@ -155,6 +155,7 @@ setenv=
 deps=
  ansible2.2: ansible==2.2.3
  ansible2.3: ansible==2.3.1
+  ansible2.4: ansible==2.4.1
  -r{toxinidir}/tests/requirements.txt
 changedir=
  # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario