aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-05-17 13:13:18 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-05-17 13:14:06 +0200
commitc068c042c8a9c02a7ba9c30257e897dab7705b2d (patch)
treeef413692929f4aa579f5bd694fc77bc7791d9487
parentdc8556e4daff91de71ec87fde2454dde4a0de9f4 (diff)
Update scenario img_file in tempest.conf
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 <cedric.ollivier@orange.com>
-rw-r--r--README.md4
-rw-r--r--functest/core/singlevm.py2
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py5
3 files changed, 5 insertions, 6 deletions
diff --git a/README.md b/README.md
index 3384a730f..5482f6388 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,8 @@ export OS_REGION_NAME=XXX
mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh | bash -s -- images && ls -1 images/*
```
-images/cirros-0.4.0-aarch64-disk.img
-images/cirros-0.4.0-x86_64-disk.img
+images/cirros-0.5.1-aarch64-disk.img
+images/cirros-0.5.1-x86_64-disk.img
images/cloudify-docker-manager-community-19.01.24.tar
images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2
images/shaker-image-1.3.0+stretch.qcow2
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))