From fa38b86cf83d68e756feb6d016a8c209478c9c5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 12 Oct 2018 18:58:41 +0200 Subject: [PATCH] test: fix docker test for lvm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The CI is still running ceph-disk tests upstream. So until https://github.com/ceph/ceph-ansible/pull/3187 is merged nothing will pass anymore. Signed-off-by: Sébastien Han --- tests/functional/tests/osd/test_osds.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/functional/tests/osd/test_osds.py b/tests/functional/tests/osd/test_osds.py index feafc219b..851c7d7f5 100644 --- a/tests/functional/tests/osd/test_osds.py +++ b/tests/functional/tests/osd/test_osds.py @@ -71,8 +71,15 @@ class TestOSDs(object): @pytest.mark.docker def test_all_docker_osds_are_up_and_in(self, node, host): - cmd = "sudo docker exec ceph-osd-0 ceph --cluster={cluster} --connect-timeout 5 --keyring /var/lib/ceph/bootstrap-osd/{cluster}.keyring -n client.bootstrap-osd osd tree -f json".format( - hostname=node["vars"]["inventory_hostname"], + osd_scenario = node["vars"].get('osd_scenario', False) + if osd_scenario in ['lvm', 'lvm-batch']: + osd_id = "0" + else: + hostname = node["vars"]["inventory_hostname"] + osd_id = os.path.join(hostname+"-sda") + + cmd = "sudo docker exec ceph-osd-{osd_id} ceph --cluster={cluster} --connect-timeout 5 --keyring /var/lib/ceph/bootstrap-osd/{cluster}.keyring -n client.bootstrap-osd osd tree -f json".format( + osd_id=osd_id, cluster=node["cluster_name"] ) output = json.loads(host.check_output(cmd)) -- 2.47.3