From: Sébastien Han <seb@redhat.com>
Date: Mon, 23 Oct 2017 10:03:01 +0000 (+0200)
Subject: Test ansible 2.4.1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f046039097d3b1f2712f71f402af21eceded9a7;p=ceph-ansible.git

Test ansible 2.4.1

We now test with Ansible 2.4. We had to change testinfra's version since
only recent versions work with 2.4. See:
https://github.com/philpep/testinfra/issues/249

Closes: https://github.com/ceph/ceph-ansible/issues/2087
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c4ad2477188c2d226a4ea2e0fa6693967d5b103c)
---

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 4d6c88e4e..fb3c70b53 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,3 +1,3 @@
-# These are Python requirements needed to run the functional tests
-testinfra==1.5.5
+# testinfra < 1.7.1 does not work Ansible 2.4, see https://github.com/philpep/testinfra/issues/249
+testinfra==1.7.1
 pytest-xdist
diff --git a/tox.ini b/tox.ini
index 785ef109e..1fa1fac8c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -66,9 +66,9 @@ setenv=
   kraken: CEPH_STABLE_RELEASE = kraken
   kraken: UPDATE_CEPH_STABLE_RELEASE = luminous
 deps=
-  ansible1.9: ansible==1.9.4
-  ansible2.1: ansible==2.1
-  ansible2.2: ansible==2.2.2
+  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 raw_multi_journal OSD scenario