From 21cc3e247b7ecbd8dd030c1a6c951cfbcf3c9d05 Mon Sep 17 00:00:00 2001 From: Georg Kunz Date: Tue, 3 Jul 2018 23:39:22 +0200 Subject: Update cirros image for bottlenecks The fraser-based OPNFV tools use the newer cirros-0.4.0 image and we hence only ask users to download this version in the user guide. This updates the bottlenecks test to comply with this. Change-Id: I5a94d6a7196ae04e00150dc17a4a16add2d3fef6 Signed-off-by: Georg Kunz --- etc/conf/bottlenecks_config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'etc/conf') diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml index 76a57c30..3c92d0f9 100644 --- a/etc/conf/bottlenecks_config.yml +++ b/etc/conf/bottlenecks_config.yml @@ -19,10 +19,10 @@ bottlenecks: dir: '/home/opnfv/userconfig' pre_condition: - 'source /tmp/admin_rc.sh && - (openstack --insecure image list | grep cirros-0.3.5 || - openstack --insecure image create cirros-0.3.5 + (openstack --insecure image list | grep cirros-0.4.0 || + openstack --insecure image create cirros-0.4.0 --disk-format qcow2 --container-format bare - --file /home/opnfv/userconfig/images/cirros-0.3.5-x86_64-disk.img)' + --file /home/opnfv/userconfig/images/cirros-0.4.0-x86_64-disk.img)' - 'source /tmp/admin_rc.sh && (openstack --insecure flavor list | grep yardstick-flavor || openstack --insecure flavor create --id 100 @@ -31,8 +31,8 @@ bottlenecks: - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} True' post_condition: - 'source /tmp/admin_rc.sh && - (! openstack --insecure image list | grep cirros-0.3.5 || - openstack --insecure image delete cirros-0.3.5)' + (! openstack --insecure image list | grep cirros-0.4.0 || + openstack --insecure image delete cirros-0.4.0)' - 'source /tmp/admin_rc.sh && (! openstack --insecure flavor list | grep yardstick-flavor || openstack --insecure flavor delete yardstick-flavor)' -- cgit 1.2.3-korg