From 0d45f4d827db18e99627e56e756269fa1251925d Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 28 Mar 2019 09:32:32 +0100 Subject: [PATCH] tests: clean tox.ini update scenario has been moved to a dedicated tox ini file. We shouldn't have any references to this scenario in the main tox ini file. Signed-off-by: Guillaume Abrioux --- tox.ini | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/tox.ini b/tox.ini index 07f3eb64c..fccd72f6d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {dev,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,update,bluestore_lvm_osds,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge,storage_inventory,lvm_auto_discovery} +envlist = {dev,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,bluestore_lvm_osds,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge,storage_inventory,lvm_auto_discovery} {dev,rhcs}-{centos,ubuntu}-container-{ooo_collocation,podman} {dev,rhcs}-{centos,ubuntu}-non_container-{switch_to_containers} dev-rhel-container-podman @@ -101,23 +101,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 "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" - 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} \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ - " - - 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 @@ -256,8 +239,6 @@ setenv= dev: UPDATE_CEPH_DEV_BRANCH = master dev: UPDATE_CEPH_DEV_SHA1 = latest dev: 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 @@ -268,7 +249,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:} @@ -337,7 +317,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} -- 2.39.5