tests: fix update scenario (stable-4.0)

perform upgrade from luminous to nautilus.

All dev* references are not needed anymore in stable-4.0

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

diff --git a/tox-update.ini b/tox-update.ini
index a34096c5532f093c84fb353fd70d1822a119f31d..f3a5c0d86ba9be4ba4ea6b3b867d64a72bd4bd8c 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -36,10 +36,10 @@ setenv=
   container: PLAYBOOK = site-docker.yml.sample
   non_container: PLAYBOOK = site.yml.sample
 
-  CEPH_DOCKER_IMAGE_TAG = latest-mimic
-  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-mimic
+  CEPH_DOCKER_IMAGE_TAG = latest-luminous
   UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus
-  CEPH_STABLE_RELEASE = mimic
+  CEPH_STABLE_RELEASE = luminous
+  UPDATE_CEPH_STABLE_RELEASE = nautilus
   ROLLING_UPDATE = True
 
 changedir={toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
@@ -60,10 +60,10 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
-      ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \
+      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-mimic} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \
       copy_admin_key={env:COPY_ADMIN_KEY:False} \
   "
 
@@ -72,9 +72,10 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/rolling_update.yml --extra-vars "\
       ireallymeanit=yes \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
+      ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} \
       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-master} \
+      ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \
   "
 
   bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests"