Merge "Add secure-rbac tests for TransportKeys API"
diff --git a/.zuul.yaml b/.zuul.yaml
index 59bd271..753b57b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,6 +6,7 @@
jobs:
- barbican-tempest-plugin-simple-crypto
- barbican-tempest-plugin-simple-crypto-secure-rbac
+ - barbican-tempest-plugin-simple-crypto-wallaby
- barbican-tempest-plugin-simple-crypto-victoria
- barbican-tempest-plugin-simple-crypto-ussuri
- barbican-tempest-plugin-simple-crypto-train
@@ -77,6 +78,11 @@
enforce_scope: True
- job:
+ name: barbican-tempest-plugin-simple-crypto-wallaby
+ parent: barbican-tempest-plugin-simple-crypto
+ override-checkout: stable/wallaby
+
+- job:
name: barbican-tempest-plugin-simple-crypto-victoria
parent: barbican-tempest-plugin-simple-crypto
nodeset: openstack-single-node-bionic
diff --git a/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py b/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
index 9241283..26919c6 100644
--- a/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
+++ b/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
@@ -133,7 +133,6 @@
self.check_tenant_network_connectivity(
server, CONF.validation.image_ssh_user, keypair['private_key'])
- volume = self.create_encrypted_volume('nova.volume.encryptors.'
- 'cryptsetup.CryptsetupEncryptor',
+ volume = self.create_encrypted_volume('plain',
volume_type='cryptsetup')
self.attach_detach_volume(server, volume, keypair)