From 5d20e2564e6424d4006dba9299c3faed9674cada Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 22 Apr 2020 18:08:06 +0100 Subject: [PATCH] Disable the pristine disk check on focal The test won't pass on serverstack due to the snapd taking a copy of the /mnt/vdb info at boot time and thus not being able to umount it is root without also running through all of the procs and checking if they also have it mounted. Thus, this just disables the test on focal and newer. --- zaza/openstack/charm_tests/ceph/tests.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/zaza/openstack/charm_tests/ceph/tests.py b/zaza/openstack/charm_tests/ceph/tests.py index 8b1c947..7b903ce 100644 --- a/zaza/openstack/charm_tests/ceph/tests.py +++ b/zaza/openstack/charm_tests/ceph/tests.py @@ -371,6 +371,13 @@ class CephTest(test_utils.OpenStackBaseTest): As the ephemeral device will have data on it we can use it to validate that these checks work as intended. """ + current_release = zaza_openstack.get_os_release() + focal_ussuri = zaza_openstack.get_os_release('focal_ussuri') + if current_release >= focal_ussuri: + # NOTE(ajkavanagh) - focal (on ServerStack) is broken for /dev/vdb + # and so this test can't pass + logging.warn("Skipping pristine disk test for focal and higher") + return logging.info('Checking behaviour when non-pristine disks appear...') logging.info('Configuring ephemeral-unmount...') alternate_conf = {