From: Guillaume Abrioux Date: Wed, 14 Aug 2019 11:58:47 +0000 (+0200) Subject: tests: tests switch_to_containers against octopus X-Git-Tag: v5.0.0alpha1~165 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e33d224d30df7e9f62e4cc07ffdb28a89dc95dd;p=ceph-ansible.git 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 --- diff --git a/tox.ini b/tox.ini index 60823416c..207cf6df3 100644 --- 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}