From: Guillaume Abrioux Date: Mon, 30 Oct 2017 13:45:59 +0000 (+0100) Subject: tests: followup on testing against ansible2.4 X-Git-Tag: v3.0.10~1^2~3 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a8069c701ca8346ae47bee607ecd47cd9025cfc5;p=ceph-ansible.git tests: followup on testing against ansible2.4 ceph-ansible is now being testing against ansible2.2 and ansible2.4. We need to update tox.ini so we use the right version of testinfra regarding which ansible version we are using. Signed-off-by: Guillaume Abrioux (cherry picked from commit 97b1cb02584e3947633aed91f3029fe8317792bc) --- diff --git a/tests/requirements.txt b/tests/requirements.txt deleted file mode 100644 index 8ead7edab..000000000 --- a/tests/requirements.txt +++ /dev/null @@ -1,4 +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 diff --git a/tests/requirements2.2.txt b/tests/requirements2.2.txt new file mode 100644 index 000000000..3e7980a12 --- /dev/null +++ b/tests/requirements2.2.txt @@ -0,0 +1,3 @@ +# These are Python requirements needed to run the functional tests +testinfra==1.6.0 +pytest-xdist diff --git a/tests/requirements2.4.txt b/tests/requirements2.4.txt new file mode 100644 index 000000000..8ead7edab --- /dev/null +++ b/tests/requirements2.4.txt @@ -0,0 +1,4 @@ +# 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 diff --git a/tox.ini b/tox.ini index c38808923..4bcb31f51 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -envlist = {dev,jewel,luminous,rhcs}-{ansible2.2,ansible2.3}-{xenial_cluster,centos7_cluster,docker_cluster,purge_cluster,purge_dmcrypt,update_dmcrypt,update_cluster,cluster,purge_docker_cluster,update_docker_cluster,switch_to_containers} - {dev,luminous}-{ansible2.2,ansible2.3}-{filestore_osds_non_container,filestore_osds_container,bluestore_osds_container,bluestore_osds_non_container,lvm_osds,purge_lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation} +envlist = {dev,jewel,luminous,rhcs}-{ansible2.2,ansible2.3,ansible2.4}-{xenial_cluster,centos7_cluster,docker_cluster,update_cluster,cluster,update_docker_cluster,switch_to_containers,purge_filestore_osds_container,purge_filestore_osds_non_container,purge_cluster_non_container,purge_cluster_container} + {dev,luminous}-{ansible2.2,ansible2.3,ansible2.4}-{filestore_osds_non_container,filestore_osds_container,bluestore_osds_container,bluestore_osds_non_container,bluestore_lvm_osds,lvm_osds,purge_lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,purge_bluestore_osds_non_container,purge_bluestore_osds_container} skipsdist = True @@ -147,9 +147,11 @@ setenv= 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.1 - -r{toxinidir}/tests/requirements.txt + ansible2.4: -r{toxinidir}/tests/requirements2.4.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