From: Guillaume Abrioux Date: Fri, 15 Jun 2018 08:44:25 +0000 (+0200) Subject: tests: keep same ceph release during handlers/idempotency test X-Git-Tag: v3.0.37~12 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8ecb0140daebddc7a75686326047407e48bca3b;p=ceph-ansible.git tests: keep same ceph release during handlers/idempotency test since `latest` points to `mimic`, we need to force the test to keep the same ceph release when testing anything else than `mimic`. Signed-off-by: Guillaume Abrioux (cherry picked from commit 21894655a7eaf0db6c99a46955e0e8ebc59a83af) --- diff --git a/tests/functional/centos/7/cluster/ceph-override.json b/tests/functional/centos/7/cluster/ceph-override.json index 67ec6d2c7..1a9600a14 100644 --- a/tests/functional/centos/7/cluster/ceph-override.json +++ b/tests/functional/centos/7/cluster/ceph-override.json @@ -5,6 +5,5 @@ "osd_pool_default_size": 1 } }, - "ceph_docker_image_tag": "latest-bis", "ceph_mon_docker_memory_limit": "2g" } diff --git a/tox.ini b/tox.ini index 9c1bc9cc3..59ed0e1d6 100644 --- a/tox.ini +++ b/tox.ini @@ -150,6 +150,8 @@ setenv= jewel: UPDATE_CEPH_STABLE_RELEASE = luminous jewel: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-luminous luminous: CEPH_STABLE_RELEASE = luminous + luminous: CEPH_DOCKER_IMAGE_TAG = latest-luminous + luminous: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-luminous luminous: UPDATE_CEPH_STABLE_RELEASE = luminous luminous: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest # Currently L is the latest stable release so it should point to 'latest' lvm_osds: CEPH_STABLE_RELEASE = luminous @@ -238,7 +240,7 @@ commands= ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis} \ ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} " \ --extra-vars @ceph-override.json