]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: do not upgrade ceph release for switch_to_containers scenario
authorGuillaume Abrioux <gabrioux@redhat.com>
Fri, 7 Sep 2018 17:38:41 +0000 (19:38 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Sun, 9 Sep 2018 12:25:14 +0000 (14:25 +0200)
Using `UPDATE_*` environment variables here will make an upgrade of the
ceph release when running switch_to_containers scenario which is not
correct.

Eg:
If ceph luminous was first deployed, then we should switch to ceph
luminous containers, not to mimic.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
tox.ini

diff --git a/tox.ini b/tox.ini
index 9764cf1c9866902b6de80075125452d86a1465f4..a041bc5a7038f7708d8de31101fd067d3a15ffe2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -137,10 +137,10 @@ commands=
       ireallymeanit=yes \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
-      ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \
-      ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest} \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest} \
+      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
   "
 
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-switch-to-containers {toxinidir}/tests/functional/tests