RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-volume tests add optional flags for vagrant

Browse Source 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Alfredo Deza 2018-03-12 10:06:47 -04:00
parent 8bd3434cf9
commit 5fbea40fc6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
View File

@ -39,7 +39,7 @@ changedir=
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}
vagrant up {env:VAGRANT_GLOBAL_EXTRA_FLAGS:""} --no-provision {posargs:--provider=virtualbox}
bash {toxinidir}/../scripts/generate_ssh_config.sh {changedir}
# create logical volumes to test with on the vms
@ -58,7 +58,7 @@ commands=
testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests
# reboot all vms
vagrant reload --no-provision
vagrant reload {env:VAGRANT_GLOBAL_EXTRA_FLAGS:""} --no-provision
# retest to ensure cluster came back up correctly after rebooting
testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests
@ -69,4 +69,4 @@ commands=
# retest to ensure cluster came back up correctly
testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests
vagrant destroy --force
vagrant destroy {env:VAGRANT_GLOBAL_EXTRA_FLAGS:""} --force

6
src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
View File

@ -36,7 +36,7 @@ changedir=
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}
vagrant up {env:VAGRANT_GLOBAL_EXTRA_FLAGS:""} --no-provision {posargs:--provider=virtualbox}
bash {toxinidir}/../scripts/generate_ssh_config.sh {changedir}
# use ceph-ansible to deploy a ceph cluster on the vms
@ -52,7 +52,7 @@ commands=
ansible-playbook -vv -i {changedir}/hosts {changedir}/test.yml
# reboot all vms
vagrant reload --no-provision
vagrant reload {env:VAGRANT_GLOBAL_EXTRA_FLAGS:""} --no-provision
# wait 2 minutes for services to be ready
sleep 120
@ -60,4 +60,4 @@ commands=
# retest to ensure cluster came back up correctly after rebooting
testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests
vagrant destroy --force
vagrant destroy {env:VAGRANT_GLOBAL_EXTRA_FLAGS:""} --force