From 806e49aadb0d832a4bf46fcd681d889d93158232 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 10 Nov 2017 13:18:07 -0500 Subject: [PATCH] ceph-volume tests.functional update lvm/tox.ini paths after moving it Signed-off-by: Alfredo Deza (cherry picked from commit 7d787849556788961155534039886aedfcdb2a88) --- .../ceph_volume/tests/functional/lvm/tox.ini | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini index 6fda7dcc09c70..e9ca249911972 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini @@ -19,19 +19,21 @@ deps= testinfra==1.7.1 pytest-xdist changedir= - centos7-filestore-create: {toxinidir}/centos7/create - xenial-filestore-create: {toxinidir}/xenial/create - xenial-bluestore-create: {toxinidir}/xenial/bluestore - centos7-bluestore-create: {toxinidir}/centos7/bluestore + centos7-filestore-create: {toxinidir}/centos7/filestore/create + centos7-bluestore-create: {toxinidir}/centos7/bluestore/create + xenial-filestore-create: {toxinidir}/xenial/filestore/create + xenial-bluestore-create: {toxinidir}/xenial/bluestore/create # TODO: these are placeholders for now, eventually we want to # test the prepare/activate workflow of ceph-volume as well - xenial-prepare_activate: {toxinidir}/xenial/prepare_activate - centos7-prepare_activate: {toxinidir}/xenial/prepare_activate + xenial-filestore-prepare_activate: {toxinidir}/xenial/filestore/prepare_activate + xenial-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate + centos7-filestore-prepare_activate: {toxinidir}/xenial/filestore/prepare_activate + centos7-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate commands= git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible vagrant up --no-provision {posargs:--provider=virtualbox} - bash {toxinidir}/scripts/generate_ssh_config.sh {changedir} + bash {toxinidir}/../scripts/generate_ssh_config.sh {changedir} # create logical volumes to test with on the vms ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml -- 2.39.5