Merge "Enable snapshot deletion with deps on ceph"
diff --git a/tempest/api/volume/test_volume_delete_cascade.py b/tempest/api/volume/test_volume_delete_cascade.py
index 53f1bca..1a50eb5 100644
--- a/tempest/api/volume/test_volume_delete_cascade.py
+++ b/tempest/api/volume/test_volume_delete_cascade.py
@@ -78,8 +78,9 @@
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 c652fe0..e284487 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