Merge "zuul: move the storage exclude list to the lvm-lio abstract job"
diff --git a/.zuul.yaml b/.zuul.yaml
index 4343f6d..f4354b7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -306,14 +306,6 @@
CINDER_TARGET_HELPER: lioadm
- job:
- name: cinder-tempest-plugin-lvm-lio-barbican-centos-8-stream
- parent: cinder-tempest-plugin-lvm-lio-barbican
- nodeset: devstack-single-node-centos-8-stream
- description: |
- This jobs configures Cinder with LVM, LIO, barbican and
- runs tempest tests and cinderlib tests on CentOS Stream 8.
-
-- job:
name: cinder-tempest-plugin-lvm-lio-barbican-centos-9-stream
parent: cinder-tempest-plugin-lvm-lio-barbican
nodeset: devstack-single-node-centos-9-stream
diff --git a/cinder_tempest_plugin/scenario/test_encrypted_volume_transfer.py b/cinder_tempest_plugin/scenario/test_encrypted_volume_transfer.py
index 7232433..bfe33b2 100644
--- a/cinder_tempest_plugin/scenario/test_encrypted_volume_transfer.py
+++ b/cinder_tempest_plugin/scenario/test_encrypted_volume_transfer.py
@@ -41,6 +41,8 @@
@classmethod
def skip_checks(cls):
super(TransferEncryptedVolumeTest, cls).skip_checks()
+ if not CONF.compute_feature_enabled.attach_encrypted_volume:
+ raise cls.skipException('Encrypted volume attach is not supported')
if not CONF.service_available.barbican:
raise cls.skipException('Barbican is required')