X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_patch.yaml;h=05eb44276007e3d759b8f5e00d057f00e2c38eb9;hb=9ceacae40f638695472d5c6dadf3ae2c3521bd81;hp=3acb3555314caa40b43bf1f733247dead7ad336d;hpb=d176e20067368d834e8b77d4f685f48cb54d03f5;p=functest.git

diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index 3acb35553..05eb44276 100644
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -1,277 +1,202 @@
 ---
+gsma:
+    tempest_smoke:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    neutron-tempest-plugin-api:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    refstack_compute:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    refstack_object:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    refstack_platform:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    patrole:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    vmtp:
+        flavor_ram: 2048
+        flavor_vcpus: 1
+        flavor_disk: 40
+    shaker:
+        flavor_ram: 2048
+        flavor_vcpus: 1
+        flavor_disk: 40
+    neutron_trunk:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    networking-bgpvpn:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    networking-sfc:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    barbican:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_full:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_scenario:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    rally_sanity:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    rally_full:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    rally_jobs:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    cloudify:
+        flavor_ram: 4096
+        flavor_vcpus: 2
+        flavor_disk: 40
+    cloudify_ims:
+        flavor_ram: 4096
+        flavor_vcpus: 2
+        flavor_disk: 40
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    heat_ims:
+        flavor_ram: 2048
+        flavor_vcpus: 1
+        flavor_disk: 40
+    vyos_vrouter:
+        flavor_ram: 4096
+        flavor_vcpus: 2
+        flavor_disk: 40
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    juju_epc:
+        flavor_ram: 2048
+        flavor_vcpus: 1
+        flavor_disk: 40
+        flavor_alt_ram: 4096
+        flavor_alt_vcpus: 2
+        flavor_alt_disk: 40
+
 fdio:
-    general:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        image_properties: {'hw_mem_page_size':'large'}
-        openstack:
-            flavor_ram: 1024
-    snaps:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
     vmready1:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     vmready2:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     singlevm1:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     singlevm2:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     vping_ssh:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     vping_userdata:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     cinder_test:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     tempest_smoke:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     neutron-tempest-plugin-api:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
-    refstack_defcore:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
+    refstack_compute:
+        flavor_ram: 1024
+    refstack_object:
+        flavor_ram: 1024
+    refstack_platform:
         flavor_ram: 1024
     patrole:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     vmtp:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 2048
     shaker:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     neutron_trunk:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     networking-bgpvpn:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     networking-sfc:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     barbican:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     tempest_full:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     tempest_scenario:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     rally_sanity:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     rally_full:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
-    cloudify:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
-    cloudify_ims:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
-    heat_ims:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-    vyos_vrouter:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
-    juju_epc:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
+    rally_jobs:
+        flavor_ram: 1024
 
 ovs:
-    general:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        image_properties: {'hw_mem_page_size':'large'}
-        openstack:
-            flavor_ram: 1024
-    snaps:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
     vmready1:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     vmready2:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     singlevm1:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     singlevm2:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     vping_ssh:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     vping_userdata:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     cinder_test:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     tempest_smoke:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     neutron-tempest-plugin-api:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
-    refstack_defcore:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
+    refstack_compute:
+        flavor_ram: 1024
+    refstack_object:
+        flavor_ram: 1024
+    refstack_platform:
         flavor_ram: 1024
     patrole:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     vmtp:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 2048
     shaker:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     neutron_trunk:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     networking-bgpvpn:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     networking-sfc:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     barbican:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     tempest_full:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     tempest_scenario:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     rally_sanity:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     rally_full:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
-    cloudify:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
-    cloudify_ims:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
-    heat_ims:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-    vyos_vrouter:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
-    juju_epc:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
-        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
-        extra_properties: {'hw_mem_page_size':'large'}
-        extra_alt_properties: {'hw_mem_page_size':'large'}
+    rally_jobs:
+        flavor_ram: 1024
 
 vio:
     vmready1:
@@ -305,7 +230,17 @@ vio:
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    refstack_defcore:
+    refstack_compute:
+        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_object:
+        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_platform:
         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
@@ -358,11 +293,16 @@ vio:
     rally_full:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
+    rally_jobs:
+        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
@@ -372,7 +312,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