Update all patches about functest configs

It takes into account the last updates about snaps, cloudify and
refstack.

Change-Id: I959f8ed1c98cd1879b51b62252aeb38918af6a2c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit dbb00ca3ee3e3349b42c8133dee6b1abdbcb10c3)

diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 1e5aed4..3d4acae 100644 (file)
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -1,11 +1,5 @@
 ---
 os:
-    general:
-        openstack:
-            image_file_name: cirros-0.4.0-aarch64-disk.img
-            image_url:
-                /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     vmready1:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
 

diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index 754f19e..406b38d 100644 (file)
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -1,8 +1,5 @@
 ---
 fdio:
-    general:
-        openstack:
-            flavor_ram: 1024
     vmready1:
         flavor_ram: 1024
     vmready2:
@@ -47,9 +44,6 @@ fdio:
         flavor_ram: 1024
 
 ovs:
-    general:
-        openstack:
-            flavor_ram: 1024
     vmready1:
         flavor_ram: 1024
     vmready2:
@@ -179,10 +173,12 @@ vio:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
     cloudify:
-        image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk
+        image:
+            /home/opnfv/functest/images/ubuntu-16.04-server-cloudimg-amd64-disk1.vmdk
         image_format: vmdk
     cloudify_ims:
-        image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk
+        image:
+            /home/opnfv/functest/images/ubuntu-16.04-server-cloudimg-amd64-disk1.vmdk
         image_format: vmdk
         image_alt:
             /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk
@@ -192,7 +188,8 @@ vio:
             /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk
         image_format: vmdk
     vyos_vrouter:
-        image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk
+        image:
+            /home/opnfv/functest/images/ubuntu-16.04-server-cloudimg-amd64-disk1.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/vyos-1.1.7.vmdk
         image_alt_format: vmdk