tests: tests switch_to_containers against octopus

since we have container images for ceph@master, we shouldn't use
nautilus anymore.

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

diff --git a/tox.ini b/tox.ini
index 60823416ce6b57788eab37f4ed1f90eecafdcd0c..207cf6df3387394a847941ac2e9b56da3d5057b2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -411,8 +411,8 @@ setenv=
   dev: UPDATE_CEPH_DEV_SHA1 = latest
   dev: CEPH_STABLE_RELEASE = nautilus
 
-  switch_to_containers: CEPH_STABLE_RELEASE = nautilus
-  switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-nautilus
+  switch_to_containers: CEPH_STABLE_RELEASE = octopus
+  switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-master
 
   ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64
 deps= -r{toxinidir}/tests/requirements.txt
@@ -445,7 +445,7 @@ changedir=
 
 commands=
   rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
-  !switch_to_containers: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
+  ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
 
   bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}