From 203c9af0ac4eeb050d038ea3fb9d99f262c3ba45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 28 Mar 2018 21:52:40 +0200 Subject: [PATCH] ci: test ansible 2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- tests/requirements2.5.txt | 1 + tox.ini | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 120000 tests/requirements2.5.txt diff --git a/tests/requirements2.5.txt b/tests/requirements2.5.txt new file mode 120000 index 000000000..2fca1748d --- /dev/null +++ b/tests/requirements2.5.txt @@ -0,0 +1 @@ +tests/requirements2.4.txt \ No newline at end of file diff --git a/tox.ini b/tox.ini index 0992ea20a..76e372877 100644 --- 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 -- 2.39.5