ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <gabrioux@redhat.com>
pull/2123/head
Guillaume Abrioux 2017-10-30 14:45:59 +01:00
parent b3c9de90f4
commit 97b1cb0258
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/requirements2.2.txt 100644
View File

@ -0,0 +1,3 @@
# These are Python requirements needed to run the functional tests
testinfra==1.6.0
pytest-xdist

0
tests/requirements.txt → tests/requirements2.4.txt
View File

8
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
envlist = {dev,jewel,luminous,rhcs}-{ansible2.2,ansible2.3}-{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} 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}-{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} {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 skipsdist = True
@ -154,9 +154,11 @@ setenv=
bluestore_lvm_osds: CEPH_STABLE_RELEASE = luminous bluestore_lvm_osds: CEPH_STABLE_RELEASE = luminous
deps= deps=
ansible2.2: ansible==2.2.3 ansible2.2: ansible==2.2.3
ansible2.2: -r{toxinidir}/tests/requirements2.2.txt
ansible2.3: ansible==2.3.1 ansible2.3: ansible==2.3.1
ansible2.3: -r{toxinidir}/tests/requirements2.2.txt
ansible2.4: ansible==2.4.1 ansible2.4: ansible==2.4.1
-r{toxinidir}/tests/requirements.txt ansible2.4: -r{toxinidir}/tests/requirements2.4.txt
changedir= changedir=
# tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario # 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 xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster