]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ci: test ansible 2.5
authorSébastien Han <seb@redhat.com>
Wed, 28 Mar 2018 19:52:40 +0000 (21:52 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 23 Apr 2018 08:17:24 +0000 (10:17 +0200)
Signed-off-by: Sébastien Han <seb@redhat.com>
tests/requirements2.5.txt [new symlink]
tox.ini

diff --git a/tests/requirements2.5.txt b/tests/requirements2.5.txt
new file mode 120000 (symlink)
index 0000000..2fca174
--- /dev/null
@@ -0,0 +1 @@
+tests/requirements2.4.txt
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 0992ea20adeec7f7e6c16c2059ae7fe93dac101f..76e372877d44faafcc309640b4db96919a43f916 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-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,ooo_collocation}
-  {dev,luminous,rhcs}-{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}
+envlist = {dev,jewel,luminous,rhcs}-{ansible2.2,ansible2.3,ansible2.4,ansible2.5}-{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,ooo_collocation}
+  {dev,luminous,rhcs}-{ansible2.3,ansible2.4,ansible2.5}-{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
 
@@ -163,6 +163,8 @@ deps=
   ansible2.3: -r{toxinidir}/tests/requirements2.2.txt
   ansible2.4: ansible==2.4.2
   ansible2.4: -r{toxinidir}/tests/requirements2.4.txt
+  ansible2.5: ansible==2.5.0
+  ansible2.5: -r{toxinidir}/tests/requirements2.5.txt
   ooo_collocation: netaddr
 changedir=
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario