From 3788826371c1a203f7f3780aeb8ccba6e4501567 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 24 Mar 2020 15:04:42 +0100 Subject: [PATCH] tests: remove some legacy in tox.ini This commit removes some leftover in tox.ini Signed-off-by: Guillaume Abrioux --- tox.ini | 93 ++------------------------------------------------------- 1 file changed, 3 insertions(+), 90 deletions(-) diff --git a/tox.ini b/tox.ini index 7c286ddc6..7f60efb9d 100644 --- a/tox.ini +++ b/tox.ini @@ -7,76 +7,6 @@ envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm skipsdist = True -# a test scenario that deploys a luminous cluster with ceph-disk osds -# and then upgrades to nautilus and migrates those osds to ceph-volume -[testenv:migrate_ceph_disk_to_ceph_volume] -whitelist_externals = - vagrant - bash - git - pip -passenv=* -setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey - ANSIBLE_CONFIG = {toxinidir}/ansible.cfg - ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions - ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback - ANSIBLE_CALLBACK_WHITELIST = profile_tasks - ANSIBLE_FILTER_PLUGINS = {toxinidir}/plugins/filter - CEPH_STABLE_RELEASE = luminous - # only available for ansible >= 2.5 - ANSIBLE_STDOUT_CALLBACK = yaml -changedir={toxinidir}/tests/functional/migrate_ceph_disk_to_ceph_volume -commands= - bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox} - bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} - - # use the stable-3.2 branch to deploy a luminous cluster - git clone -b {env:CEPH_ANSIBLE_BRANCH:stable-3.2} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible - pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt - - ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/setup.yml - - # deploy the cluster - ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ - delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ - ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ - ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ - " - - # wait 30sec for services to be ready - sleep 30 - # test cluster state using ceph-ansible tests - py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts --ssh-config={changedir}/vagrant_ssh_config {envdir}/tmp/ceph-ansible/tests/functional/tests - - # install ceph-ansible@master requirements - pip install -r {toxinidir}/tests/requirements.txt - - # migrate osds to ceph-volume and upgrade to nautilus - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/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_stable_release=nautilus \ - osd_scenario=lvm \ - " - - # test cluster state again using ceph-ansible tests - bash -c "CEPH_STABLE_RELEASE=nautilus py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" - - # reboot all vms - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/reboot.yml - - # retest to ensure cluster came back up correctly after rebooting - bash -c "CEPH_STABLE_RELEASE=nautilus py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" - - vagrant destroy --force - # a test scenario for the lv-create.yml and lv-teardown playbooks [testenv:infra_lv_create] whitelist_externals = @@ -122,7 +52,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ @@ -134,7 +63,6 @@ commands= # set up the cluster again ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ @@ -150,7 +78,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ @@ -161,7 +88,6 @@ commands= # set up the cluster again ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ @@ -236,7 +162,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/infrastructure-playbooks/add-mon.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ @@ -252,7 +177,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ @@ -267,7 +191,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit mgrs {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ @@ -282,7 +205,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit mdss {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ @@ -297,7 +219,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ @@ -312,7 +233,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit rgws {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ @@ -334,7 +254,6 @@ commands= ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/secondary/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ @@ -391,17 +310,12 @@ setenv= shrink_rbdmirror: RBDMIRROR_TO_KILL = rbd-mirror0 shrink_rgw: RGW_TO_KILL = rgw0.rgw0 - lvm_osds: CEPH_STABLE_RELEASE = luminous - CEPH_DOCKER_IMAGE_TAG = latest-master CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-master UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master - UPDATE_CEPH_DEV_BRANCH = master - UPDATE_CEPH_DEV_SHA1 = latest - CEPH_STABLE_RELEASE = nautilus + CEPH_STABLE_RELEASE = pacific - switch_to_containers: CEPH_STABLE_RELEASE = octopus - switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-master-devel + switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-master ooo_collocation: CEPH_DOCKER_IMAGE_TAG = latest-master deps= -r{toxinidir}/tests/requirements.txt @@ -450,7 +364,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ @@ -472,7 +385,7 @@ commands= all_daemons: py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests # handlers/idempotency test - all_daemons,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-master} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --extra-vars @ceph-override.json + all_daemons,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-master} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --extra-vars @ceph-override.json purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands}