tests: refact ci testing master

We should test ceph-ansible against the latest ansible stable version on
master.

This commit also remove the pinning to 1.7.1 version of testinfra
because ansible 2.5 requires a newer version.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/tests/requirements.txt b/tests/requirements.txt
new file mode 100644 (file)
index 0000000..648c076
--- /dev/null
+++ b/tests/requirements.txt
@@ -0,0 +1,7 @@
+# These are Python requirements needed to run the functional tests
+testinfra
+pytest-xdist
+pytest==3.6.1
+notario>=0.0.13
+ansible~=2.5,<2.6
+netaddr

diff --git a/tests/requirements2.2.txt b/tests/requirements2.2.txt
deleted file mode 100644 (file)
index 9379c12..0000000
--- a/tests/requirements2.2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# These are Python requirements needed to run the functional tests
-testinfra==1.6.0
-pytest-xdist
-notario>=0.0.13

diff --git a/tests/requirements2.4.txt b/tests/requirements2.4.txt
deleted file mode 100644 (file)
index 599623e..0000000
--- a/tests/requirements2.4.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# These are Python requirements needed to run the functional tests
-# testinfra < 1.7.1 does not work Ansible 2.4, see https://github.com/philpep/testinfra/issues/249
-testinfra==1.7.1
-pytest-xdist
-pytest==3.6.1
-notario>=0.0.13

diff --git a/tests/requirements2.5.txt b/tests/requirements2.5.txt
deleted file mode 120000 (symlink)
index 1f8cc75..0000000
--- a/tests/requirements2.5.txt
+++ /dev/null
@@ -1 +0,0 @@
-requirements2.4.txt
\ No newline at end of file

diff --git a/tox.ini b/tox.ini
index b5859dacf3fa88f8d66788fb93e685e79ee92aaa..431fa57e1110f336d6c296562d120d70e16ef485 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -160,16 +160,7 @@ setenv=
   luminous: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest
   lvm_osds: CEPH_STABLE_RELEASE = luminous
   bluestore_lvm_osds: CEPH_STABLE_RELEASE = luminous
-deps=
-  ansible2.2: ansible==2.2.3
-  ansible2.2: -r{toxinidir}/tests/requirements2.2.txt
-  ansible2.3: ansible==2.3.1
-  ansible2.3: -r{toxinidir}/tests/requirements2.2.txt
-  ansible2.4: ansible~=2.4,<2.5
-  ansible2.4: -r{toxinidir}/tests/requirements2.4.txt
-  ansible2.5: ansible~=2.5,<2.6
-  ansible2.5: -r{toxinidir}/tests/requirements2.5.txt
-  ooo_collocation: netaddr
+deps= -r{toxinidir}/tests/requirements.txt
 changedir=
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario
   xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster