From 21894655a7eaf0db6c99a46955e0e8ebc59a83af Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 15 Jun 2018 10:44:25 +0200 Subject: [PATCH] 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 --- tests/functional/centos/7/cluster/ceph-override.json | 1 - tox.ini | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) 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 836bfd79d..b4e2fc0dd 100644 --- a/tox.ini +++ b/tox.ini @@ -155,6 +155,7 @@ setenv= 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 lvm_osds: CEPH_STABLE_RELEASE = luminous @@ -249,7 +250,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} \ copy_admin_key={env:COPY_ADMIN_KEY:False} " \