Update Cirros everywhere except Tempest

Tempest still asks for 0.5.1

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

diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 2782656..08dcf00 100644 (file)
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -1,19 +1,19 @@
 ---
 os:
     vmready1:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     vmready2:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     singlevm1:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     singlevm2:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     vping_ssh:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     vping_userdata:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     cinder_test:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     tempest_smoke:
         image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
         image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
@@ -37,7 +37,7 @@ os:
         image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
         image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     rally_sanity:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     refstack_compute:
         image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
         image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
@@ -79,7 +79,7 @@ os:
         image_alt:
             /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.aarch64.qcow2
     rally_sanity_cntt:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     tempest_full_cntt:
         image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
         image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
@@ -90,10 +90,10 @@ os:
         image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
         image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     rally_full:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     rally_jobs:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     rally_full_cntt:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img
     rally_jobs_cntt:
-        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.6.1-aarch64-disk.img

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 647301a..81595ff 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -18,10 +18,10 @@ general:
         rally_inst: /root/.rally
 
     openstack:
-        image_name: Cirros-0.5.1
-        image_name_alt: Cirros-0.5.1-1
-        image_file_name: cirros-0.5.1-x86_64-disk.img
-        image_url: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.img
+        image_name: Cirros-0.6.1
+        image_name_alt: Cirros-0.6.1-1
+        image_file_name: cirros-0.6.1-x86_64-disk.img
+        image_url: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.img
         image_user: cirros
         image_disk_format: qcow2
         image_username: cirros

diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index d5335c3..b64131d 100644 (file)
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -312,25 +312,25 @@ ovs:
 
 vio:
     vmready1:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     vmready2:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     singlevm1:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     singlevm2:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     vping_ssh:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     vping_userdata:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     cinder_test:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     tempest_smoke:
         image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
@@ -369,7 +369,7 @@ vio:
         image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     rally_sanity:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     refstack_compute:
         image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
@@ -438,7 +438,7 @@ vio:
             /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.x86_64.vmdk
         image_alt_format: vmdk
     rally_sanity_cntt:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     tempest_full_cntt:
         image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
@@ -456,23 +456,23 @@ vio:
         image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     rally_full:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     rally_jobs:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     vmtp:
         image:
-            /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk
+            /home/opnfv/functest/images/ubuntu-18.04-server-cloudimg-amd64-disk1.vmdk
         image_format: vmdk
     shaker:
         image: /home/opnfv/functest/images/shaker-image.vmdk
         image_format: vmdk
     rally_full_cntt:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     rally_jobs_cntt:
-        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.vmdk
         image_format: vmdk
     cloudify:
         image:

diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index 4067bdb..b475f18 100644 (file)
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -7,10 +7,12 @@ wget_opts="-N --tries=1 --connect-timeout=30"
 
 cat << EOF  | wget ${wget_opts} -i - -P ${1:-/home/opnfv/functest/images}
 http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img
+http://download.cirros-cloud.net/0.6.1/cirros-0.6.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.5.1/cirros-0.5.1-aarch64-disk.img
+http://download.cirros-cloud.net/0.6.1/cirros-0.6.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/ci/rally_aarch64_patch.conf b/functest/ci/rally_aarch64_patch.conf
index 4ea0d76..f9f4ddc 100644 (file)
--- a/functest/ci/rally_aarch64_patch.conf
+++ b/functest/ci/rally_aarch64_patch.conf
@@ -1,5 +1,5 @@
 img_name_regex = ^TestVM$
-img_url = http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-aarch64-disk.img
+img_url = http://download.cirros-cloud.net/0.6.1/cirros-0.6.1-aarch64-disk.img
 flavor_ref_ram = 256
 flavor_ref_alt_ram = 256
 heat_instance_type_ram = 256

diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index 64c31bb..4bce516 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.5.1-x86_64-disk.img'
+    filename = '/home/opnfv/functest/images/cirros-0.6.1-x86_64-disk.img'
     image_format = 'qcow2'
     extra_properties = {}
     filename_alt = filename
@@ -433,9 +433,6 @@ class SingleVm1(VmReady1):
                         config.CONF,
                         f'{self.case_name}_image_user', self.username),
                     key_filename=self.key_filename,
-                    disabled_algorithms={
-                        "pubkeys": ["rsa-sha2-256", "rsa-sha2-512"]
-                    },
                     timeout=getattr(
                         config.CONF,
                         f'{self.case_name}_vm_ssh_connect_timeout',

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 f1a12c1..75afb2d 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.5.1-x86_64-uec
+    default: cirros-0.6.1-x86_64-uec
   flavor:
     type: string
     default: m1.tiny

diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
index 9a0f1aa..bbc7c60 100644 (file)
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
+++ b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
@@ -4,7 +4,7 @@ parameters:
   # set all correct defaults for parameters before launch test
   image:
     type: string
-    default: cirros-0.5.1-x86_64-uec
+    default: cirros-0.6.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 808ccba..e8205ff 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -39,6 +39,7 @@ class TempestCommon(singlevm.VmReady2):
     """TempestCommon testcases implementation class."""
 
     visibility = 'public'
+    filename = '/home/opnfv/functest/images/cirros-0.5.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(