mirror of https://github.com/ceph/ceph-ansible.git
tox: Remove update scenario reference
update scenario is now handled by tox-update.ini file so we shoudn't
have update reference in tox.ini file.
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 8ab6a3391f
)
pull/3917/merge
parent
690336aabd
commit
748605293e
18
tox.ini
18
tox.ini
|
@ -170,20 +170,6 @@ commands=
|
|||
# test that the cluster can be redeployed in a healthy state
|
||||
py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests
|
||||
|
||||
# extra commands for performing a rolling update
|
||||
[update]
|
||||
commands=
|
||||
cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/rolling_update.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
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} \
|
||||
"
|
||||
|
||||
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"
|
||||
|
||||
[shrink-mon]
|
||||
commands=
|
||||
cp {toxinidir}/infrastructure-playbooks/shrink-mon.yml {toxinidir}/shrink-mon.yml
|
||||
|
@ -342,8 +328,6 @@ setenv=
|
|||
nautilus: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus
|
||||
nautilus: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus
|
||||
nautilus: CEPH_STABLE_RELEASE = nautilus
|
||||
update: CEPH_STABLE_RELEASE = mimic
|
||||
update: ROLLING_UPDATE = True
|
||||
|
||||
ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64
|
||||
deps= -r{toxinidir}/tests/requirements.txt
|
||||
|
@ -354,7 +338,6 @@ changedir=
|
|||
shrink_osd: {toxinidir}/tests/functional/shrink_osd{env:CONTAINER_DIR:}
|
||||
# tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker
|
||||
collocation: {toxinidir}/tests/functional/collocation{env:CONTAINER_DIR:}
|
||||
update: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
|
||||
purge: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
|
||||
switch_to_containers: {toxinidir}/tests/functional/all_daemons
|
||||
lvm_osds: {toxinidir}/tests/functional/lvm-osds{env:CONTAINER_DIR:}
|
||||
|
@ -411,7 +394,6 @@ commands=
|
|||
|
||||
purge: {[purge]commands}
|
||||
switch_to_containers: {[switch-to-containers]commands}
|
||||
update: {[update]commands}
|
||||
shrink_mon: {[shrink-mon]commands}
|
||||
shrink_osd: {[shrink-osd]commands}
|
||||
add_osds: {[add-osds]commands}
|
||||
|
|
Loading…
Reference in New Issue