X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_patch.yaml;h=754f19edfd174ad90ab904b4684d23e3a0e12cac;hb=d777f2e588a321d5c01e2e50ffa5c8fc5a27c77c;hp=865a564e63c5c08108b6933adc53723117d43922;hpb=16b9a69410fd0aaa9a55b023997bb3872ee5907d;p=functest.git

diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index 865a564e6..754f19edf 100644
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -1,22 +1,205 @@
-lxd:
+---
+fdio:
     general:
         openstack:
-            image_name: Cirros-0.3.5
-            image_file_name:  cirros-0.3.5-x86_64-lxc.tar.gz
-            image_disk_format:  raw
+            flavor_ram: 1024
+    vmready1:
+        flavor_ram: 1024
+    vmready2:
+        flavor_ram: 1024
+    singlevm1:
+        flavor_ram: 1024
+    singlevm2:
+        flavor_ram: 1024
+    vping_ssh:
+        flavor_ram: 1024
+    vping_userdata:
+        flavor_ram: 1024
+    cinder_test:
+        flavor_ram: 1024
+    tempest_smoke:
+        flavor_ram: 1024
+    neutron-tempest-plugin-api:
+        flavor_ram: 1024
+    refstack_defcore:
+        flavor_ram: 1024
+    patrole:
+        flavor_ram: 1024
+    vmtp:
+        flavor_ram: 2048
+    shaker:
+        flavor_ram: 1024
+    neutron_trunk:
+        flavor_ram: 1024
+    networking-bgpvpn:
+        flavor_ram: 1024
+    networking-sfc:
+        flavor_ram: 1024
+    barbican:
+        flavor_ram: 1024
+    tempest_full:
+        flavor_ram: 1024
+    tempest_scenario:
+        flavor_ram: 1024
+    rally_sanity:
+        flavor_ram: 1024
+    rally_full:
+        flavor_ram: 1024
 
-    healthcheck:
-        disk_image: /home/opnfv/functest/data/cirros-0.3.5-x86_64-lxc.tar.gz
-        disk_format: raw
-fdio:
-    general:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        image_properties: {'hw_mem_page_size':'large'}
-    tempest:
-        use_custom_flavors: True
 ovs:
     general:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        image_properties: {'hw_mem_page_size':'large'}
-    tempest:
-        use_custom_flavors: True
+        openstack:
+            flavor_ram: 1024
+    vmready1:
+        flavor_ram: 1024
+    vmready2:
+        flavor_ram: 1024
+    singlevm1:
+        flavor_ram: 1024
+    singlevm2:
+        flavor_ram: 1024
+    vping_ssh:
+        flavor_ram: 1024
+    vping_userdata:
+        flavor_ram: 1024
+    cinder_test:
+        flavor_ram: 1024
+    tempest_smoke:
+        flavor_ram: 1024
+    neutron-tempest-plugin-api:
+        flavor_ram: 1024
+    refstack_defcore:
+        flavor_ram: 1024
+    patrole:
+        flavor_ram: 1024
+    vmtp:
+        flavor_ram: 2048
+    shaker:
+        flavor_ram: 1024
+    neutron_trunk:
+        flavor_ram: 1024
+    networking-bgpvpn:
+        flavor_ram: 1024
+    networking-sfc:
+        flavor_ram: 1024
+    barbican:
+        flavor_ram: 1024
+    tempest_full:
+        flavor_ram: 1024
+    tempest_scenario:
+        flavor_ram: 1024
+    rally_sanity:
+        flavor_ram: 1024
+    rally_full:
+        flavor_ram: 1024
+
+vio:
+    vmready1:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    vmready2:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    singlevm1:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    singlevm2:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    vping_ssh:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    vping_userdata:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    cinder_test:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    tempest_smoke:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    neutron-tempest-plugin-api:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    refstack_defcore:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    patrole:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    vmtp:
+        image:
+            /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk
+        image_format: vmdk
+    shaker:
+        image: /home/opnfv/functest/images/shaker-image.vmdk
+        image_format: vmdk
+    neutron_trunk:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    networking-bgpvpn:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    networking-sfc:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    barbican:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_full:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_scenario:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    rally_sanity:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    rally_full:
+        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_format: vmdk
+    cloudify_ims:
+        image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk
+        image_format: vmdk
+        image_alt:
+            /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk
+        image_alt_format: vmdk
+    heat_ims:
+        image:
+            /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_format: vmdk
+        image_alt: /home/opnfv/functest/images/vyos-1.1.7.vmdk
+        image_alt_format: vmdk
+    juju_epc:
+        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
+        image_alt_format: vmdk