From 3734754dc6312329f895aff9ec7e6dd4329d14cd Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 17 May 2021 13:13:18 +0200 Subject: Update scenario img_file in tempest.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's now an absolute filename [1]. It also updates the cirros version. [1] https://github.com/openstack/barbican-tempest-plugin/commit/3f35bff1e19e9ff20bec6d5bbebcd5bb2b10fb49 Change-Id: I6c88b2a6347094466359304d99a2e8195f7ae049 Signed-off-by: Cédric Ollivier (cherry picked from commit c068c042c8a9c02a7ba9c30257e897dab7705b2d) --- functest/core/singlevm.py | 2 +- functest/opnfv_tests/openstack/tempest/tempest.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'functest') diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index 3d968cfd6..59071112e 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -39,7 +39,7 @@ class VmReady1(tenantnetwork.TenantNetwork1): # pylint: disable=too-many-instance-attributes __logger = logging.getLogger(__name__) - filename = '/home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img' + filename = '/home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.img' image_format = 'qcow2' extra_properties = {} filename_alt = filename diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 0a4deb517..2645e6f19 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -39,7 +39,7 @@ class TempestCommon(singlevm.VmReady2): """TempestCommon testcases implementation class.""" visibility = 'public' - filename_alt = '/home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img' + filename_alt = '/home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.img' shared_network = True tempest_conf_yaml = pkg_resources.resource_filename( 'functest', @@ -564,8 +564,7 @@ class TempestCommon(singlevm.VmReady2): config.CONF, '{}_image'.format(self.case_name), self.filename) if not rconfig.has_section('scenario'): rconfig.add_section('scenario') - rconfig.set('scenario', 'img_file', os.path.basename(filename)) - rconfig.set('scenario', 'img_dir', os.path.dirname(filename)) + rconfig.set('scenario', 'img_file', filename) rconfig.set('scenario', 'img_disk_format', getattr( config.CONF, '{}_image_format'.format(self.case_name), self.image_format)) -- cgit 1.2.3-korg