From: Guillaume Abrioux Date: Fri, 27 Oct 2017 11:22:28 +0000 (+0200) Subject: tests: sync with ceph/ceph-build for ceph-ansible-nightlies X-Git-Tag: v3.0.10~1^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7f3bbc171b53ddb3924fec09ceb63d67e371e81;p=ceph-ansible.git tests: sync with ceph/ceph-build for ceph-ansible-nightlies Signed-off-by: Guillaume Abrioux (cherry picked from commit de0900eae174f9b74761016c6a6927b54a4d43b7) --- diff --git a/tox.ini b/tox.ini index 71cf51737..3ce41d891 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} - {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} + {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} skipsdist = True @@ -143,10 +143,8 @@ setenv= rhcs: CEPH_STABLE_RELEASE = luminous jewel: CEPH_STABLE_RELEASE = jewel - jewel: CEPH_DOCKER_IMAGE_TAG = tag-build-master-jewel-ubuntu-16.04 - jewel: UPDATE_CEPH_STABLE_RELEASE = kraken + jewel: UPDATE_CEPH_STABLE_RELEASE = luminous luminous: CEPH_STABLE_RELEASE = luminous - luminous: CEPH_DOCKER_IMAGE_TAG = tag-build-master-luminous-ubuntu-16.04 luminous: UPDATE_CEPH_STABLE_RELEASE = luminous luminous: UPDATE_CEPH_DOCKER_IMAGE_TAG = tag-build-master-luminous-ubuntu-16.04 lvm_osds: CEPH_STABLE_RELEASE = luminous