From 26186cf964be0bdeef82267de13e7257c413bafa Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Fri, 22 Jan 2021 10:10:32 +0000 Subject: [PATCH] test_encrypted_cinder_volumes: Do not create an image for this test As with I50d3b874b7e0676436c434be6c059f221041560f for the cinder-tempest-plugin this encrypted volume test does not require a unique image to create an instance. The creation leading to test failures in the nova-ceph-multistore job that sets [workarounds]/never_download_image_if_on_rbd while valdiating some edge usecases. This change simply removes the creation of the image and relys instead on the behaviour of tempest.common.compute.create_test_server that uses CONF.compute.image_ref when an image_id is not provided [1]. [1] https://opendev.org/openstack/tempest/src/branch/master/tempest/common/compute.py#L108-L109 Change-Id: Iee0d863770def63df8601222265dc22226457c0c Related-Bug: #1912607 --- tempest/scenario/test_encrypted_cinder_volumes.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tempest/scenario/test_encrypted_cinder_volumes.py b/tempest/scenario/test_encrypted_cinder_volumes.py index fc93a5efa5..6ee9f28a0d 100644 --- a/tempest/scenario/test_encrypted_cinder_volumes.py +++ b/tempest/scenario/test_encrypted_cinder_volumes.py @@ -30,8 +30,7 @@ class TestEncryptedCinderVolumes(manager.EncryptionScenarioTest): For both LUKS and cryptsetup encryption types, this test performs the following: - * Creates an image in Glance - * Boots an instance from the image + * Boots an instance from an image (CONF.compute.image_ref) * Creates an encryption type (as admin) * Creates a volume of that encryption type (as a regular user) * Attaches and detaches the encrypted volume to the instance @@ -44,10 +43,9 @@ class TestEncryptedCinderVolumes(manager.EncryptionScenarioTest): raise cls.skipException('Encrypted volume attach is not supported') def launch_instance(self): - image = self.image_create() keypair = self.create_keypair() - return self.create_server(image_id=image, key_name=keypair['name']) + return self.create_server(key_name=keypair['name']) def attach_detach_volume(self, server, volume): attached_volume = self.nova_volume_attach(server, volume)