From b6d09b510fe69b2a484dfe9b0450449d34b0afa7 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 31 May 2018 12:02:26 +0200 Subject: [PATCH] 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 --- tests/{requirements2.2.txt => requirements.txt} | 5 ++++- tests/requirements2.4.txt | 6 ------ tests/requirements2.5.txt | 1 - tox.ini | 11 +---------- 4 files changed, 5 insertions(+), 18 deletions(-) rename tests/{requirements2.2.txt => requirements.txt} (65%) delete mode 100644 tests/requirements2.4.txt delete mode 120000 tests/requirements2.5.txt diff --git a/tests/requirements2.2.txt b/tests/requirements.txt similarity index 65% rename from tests/requirements2.2.txt rename to tests/requirements.txt index 9379c1241..648c0768a 100644 --- a/tests/requirements2.2.txt +++ b/tests/requirements.txt @@ -1,4 +1,7 @@ # These are Python requirements needed to run the functional tests -testinfra==1.6.0 +testinfra pytest-xdist +pytest==3.6.1 notario>=0.0.13 +ansible~=2.5,<2.6 +netaddr diff --git a/tests/requirements2.4.txt b/tests/requirements2.4.txt deleted file mode 100644 index 599623ec6..000000000 --- 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 index 1f8cc7508..000000000 --- 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 b5859dacf..431fa57e1 100644 --- 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 -- 2.39.5