From 09cff3cb788178048572df276ef7ea8d96c40f87 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Mon, 16 Sep 2024 12:28:10 +0200 Subject: [PATCH] Enable snapshot deletion with deps on ceph This is not be a problem anymore with newer ceph and devstack-plugin-ceph has been setting the minimum client version to mimic (which enables the required features) for a while. So use the new variable which references volume/image dependencies but it is really about volume dependencies. Change-Id: I673497466b0fb6f7954aebe05ee6d1bd24e78769 --- tempest/api/volume/test_volume_delete_cascade.py | 5 +++-- zuul.d/project.yaml | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tempest/api/volume/test_volume_delete_cascade.py b/tempest/api/volume/test_volume_delete_cascade.py index 53f1bcac3a..1a50eb5dfb 100644 --- a/tempest/api/volume/test_volume_delete_cascade.py +++ b/tempest/api/volume/test_volume_delete_cascade.py @@ -78,8 +78,9 @@ class VolumesDeleteCascade(base.BaseVolumeTest): self._assert_cascade_delete(volume['id']) @decorators.idempotent_id('59a77ede-609b-4ee8-9f68-fc3c6ffe97b5') - @testtools.skipIf(CONF.volume.storage_protocol == 'ceph', - 'Skip because of Bug#1677525') + @testtools.skipUnless( + CONF.volume_feature_enabled.enable_volume_image_dep_tests, + 'Volume dependency tests disabled') def test_volume_from_snapshot_cascade_delete(self): """Test deleting a volume with associated volume-associated snapshot diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index c652fe0715..e284487700 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -103,9 +103,7 @@ - tempest-full-enforce-scope-new-defaults: irrelevant-files: *tempest-irrelevant-files - devstack-plugin-ceph-tempest-py3: - # TODO(kopecmartin): make it voting once the below bug is fixed - # https://bugs.launchpad.net/devstack-plugin-ceph/+bug/1975648 - voting: false + timeout: 9000 irrelevant-files: *tempest-irrelevant-files - neutron-ovs-grenade-multinode: irrelevant-files: *tempest-irrelevant-files