Revert to Cirros 0.5.1

Change-Id: Ie4b09aeeaebdf5224824bab54a8087d8c252e952
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/README.md b/README.md
index 14590e9..f260004 100644 (file)
--- a/README.md
+++ b/README.md
@@ -54,8 +54,8 @@ export OS_REGION_NAME=XXX
 
 mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh?h=master | sh -s -- images && ls -1 images/*
 ```
-images/cirros-0.6.1-aarch64-disk.img
-images/cirros-0.6.1-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/ci/download_images.sh b/functest/ci/download_images.sh
index a56c02b..4067bdb 100644 (file)
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -6,11 +6,11 @@ wget_opts="-N --tries=1 --connect-timeout=30"
 [ -t 1 ] || wget_opts="${wget_opts} --progress=dot:giga"
 
 cat << EOF  | wget ${wget_opts} -i - -P ${1:-/home/opnfv/functest/images}
-http://download.cirros-cloud.net/0.6.1/cirros-0.6.1-x86_64-disk.img
+http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img
 https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img
 https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
 https://cloud-images.ubuntu.com/releases/18.04/release/ubuntu-18.04-server-cloudimg-amd64.img
-http://download.cirros-cloud.net/0.6.1/cirros-0.6.1-aarch64-disk.img
+http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-aarch64-disk.img
 http://repository.cloudifysource.org/cloudify/19.01.24/community-release/cloudify-docker-manager-community-19.01.24.tar
 http://testresults.opnfv.org/functest/vyos-1.1.8-amd64.qcow2
 http://testresults.opnfv.org/functest/shaker-image-1.3.4+stretch.qcow2

diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index 4bce516..7bb4e16 100644 (file)
--- 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.6.1-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/rally/scenario/templates/server_with_ports.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
index 75afb2d..f1a12c1 100644 (file)
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
+++ b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
@@ -7,7 +7,7 @@ parameters:
     default: public
   image:
     type: string
-    default: cirros-0.6.1-x86_64-uec
+    default: cirros-0.5.1-x86_64-uec
   flavor:
     type: string
     default: m1.tiny

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 7233ffd..808ccba 100644 (file)
--- 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.6.1-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',