From 876b4ad24833c43caad8afaf31fef9cd4111c996 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Sun, 4 Oct 2020 10:18:39 +0200 Subject: [PATCH] tests: remove ooo_collocation job This job is redundant with 'collocation' job. The only difference is osd/rgw collocation so let's add this usecase in 'collocation'. Signed-off-by: Guillaume Abrioux (cherry picked from commit 19d683d7acfb5344b38ac1ba4c123dcdd4d80f35) --- tests/functional/collocation/hosts | 1 + tests/functional/dev_setup.yml | 2 +- tox.ini | 5 +---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/functional/collocation/hosts b/tests/functional/collocation/hosts index 91f99b022..ab7ed04b7 100644 --- a/tests/functional/collocation/hosts +++ b/tests/functional/collocation/hosts @@ -11,6 +11,7 @@ mds0 rgw0 [rgws] +osd0 rgw0 mds0 diff --git a/tests/functional/dev_setup.yml b/tests/functional/dev_setup.yml index 8fabf4fae..fa85231c2 100644 --- a/tests/functional/dev_setup.yml +++ b/tests/functional/dev_setup.yml @@ -9,7 +9,7 @@ - block: - name: set_fact group_vars_path set_fact: - group_vars_path: "{{ change_dir + '/hosts' if 'ooo-collocation' in change_dir.split('/') else change_dir + '/inventory/group_vars' if 'external_clients' in change_dir.split('/') else change_dir + '/group_vars' }}" + group_vars_path: "{{ change_dir + '/inventory/group_vars' if 'external_clients' in change_dir.split('/') else change_dir + '/group_vars' }}" - block: - name: change ceph_repository to 'dev' diff --git a/tox.ini b/tox.ini index 8b700b806..82bbe64b1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ [tox] envlist = centos-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mgr,shrink_mds,shrink_rbdmirror,shrink_rgw,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery,all_in_one,cephadm_adopt} - centos-container-{ooo_collocation} centos-non_container-{switch_to_containers} infra_lv_create migrate_ceph_disk_to_ceph_volume @@ -312,7 +311,6 @@ setenv= switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-master-devel - ooo_collocation: CEPH_DOCKER_IMAGE_TAG = latest-master deps= -r{toxinidir}/tests/requirements.txt changedir= all_daemons: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} @@ -330,7 +328,6 @@ changedir= switch_to_containers: {toxinidir}/tests/functional/all_daemons lvm_osds: {toxinidir}/tests/functional/lvm-osds{env:CONTAINER_DIR:} lvm_batch: {toxinidir}/tests/functional/lvm-batch{env:CONTAINER_DIR:} - ooo_collocation: {toxinidir}/tests/functional/ooo-collocation add_mons: {toxinidir}/tests/functional/add-mons{env:CONTAINER_DIR:} add_osds: {toxinidir}/tests/functional/add-osds{env:CONTAINER_DIR:} add_mgrs: {toxinidir}/tests/functional/add-mgrs{env:CONTAINER_DIR:} @@ -351,7 +348,7 @@ commands= bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} # configure lvm - !lvm_batch-!lvm_auto_discovery-!ooo_collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml + !lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup" -- 2.39.5