X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_patch.yaml;h=d5335c3ab38f772cba434bad1cb7060644df9a09;hb=8852b2d0128ddde3e45cacf6163000745b00b175;hp=42220832ef5d572c49713f843b52fbb4b56f0858;hpb=5eda2839ca79d4cc82b0940ff6e123db96bfbfbe;p=functest.git

diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index 42220832e..d5335c3ab 100644
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -1,10 +1,160 @@
 ---
+gsma:
+    tempest_smoke:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_horizon:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_neutron:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_cinder:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_keystone:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_heat:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_telemetry:
+        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
+    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
+    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
+    tempest_slow:
+        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
+    tempest_barbican:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_octavia:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_neutron_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_cinder_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_keystone_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_heat_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    rally_sanity_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_full_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_scenario_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_slow_cntt:
+        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
+    vmtp:
+        flavor_ram: 2048
+        flavor_vcpus: 1
+        flavor_disk: 40
+    shaker:
+        flavor_ram: 2048
+        flavor_vcpus: 1
+        flavor_disk: 40
+    rally_full_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    rally_jobs_cntt:
+        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:
-        openstack:
-            flavor_ram: 1024
-    snaps:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
     vmready1:
         flavor_ram: 1024
     vmready2:
@@ -21,39 +171,68 @@ fdio:
         flavor_ram: 1024
     tempest_smoke:
         flavor_ram: 1024
-    neutron-tempest-plugin-api:
+    tempest_horizon:
         flavor_ram: 1024
-    refstack_defcore:
+    tempest_neutron:
         flavor_ram: 1024
-    patrole:
+    tempest_cinder:
         flavor_ram: 1024
-    vmtp:
-        flavor_ram: 2048
-    shaker:
+    tempest_keystone:
         flavor_ram: 1024
-    neutron_trunk:
+    tempest_heat:
         flavor_ram: 1024
-    networking-bgpvpn:
+    tempest_telemetry:
+        flavor_ram: 1024
+    rally_sanity:
         flavor_ram: 1024
-    networking-sfc:
+    refstack_compute:
         flavor_ram: 1024
-    barbican:
+    refstack_object:
+        flavor_ram: 1024
+    refstack_platform:
         flavor_ram: 1024
     tempest_full:
         flavor_ram: 1024
     tempest_scenario:
         flavor_ram: 1024
-    rally_sanity:
+    tempest_slow:
+        flavor_ram: 1024
+    patrole:
+        flavor_ram: 1024
+    tempest_barbican:
+        flavor_ram: 1024
+    tempest_octavia:
+        flavor_ram: 1024
+    tempest_neutron_cntt:
+        flavor_ram: 1024
+    tempest_cinder_cntt:
+        flavor_ram: 1024
+    tempest_keystone_cntt:
+        flavor_ram: 1024
+    tempest_heat_cntt:
+        flavor_ram: 1024
+    rally_sanity_cntt:
+        flavor_ram: 1024
+    tempest_full_cntt:
+        flavor_ram: 1024
+    tempest_scenario_cntt:
+        flavor_ram: 1024
+    tempest_slow_cntt:
         flavor_ram: 1024
     rally_full:
         flavor_ram: 1024
+    rally_jobs:
+        flavor_ram: 1024
+    vmtp:
+        flavor_ram: 2048
+    shaker:
+        flavor_ram: 1024
+    rally_full_cntt:
+        flavor_ram: 1024
+    rally_jobs_cntt:
+        flavor_ram: 1024
 
 ovs:
-    general:
-        openstack:
-            flavor_ram: 1024
-    snaps:
-        flavor_extra_specs: {'hw:mem_page_size':'large'}
     vmready1:
         flavor_ram: 1024
     vmready2:
@@ -70,123 +249,238 @@ ovs:
         flavor_ram: 1024
     tempest_smoke:
         flavor_ram: 1024
-    neutron-tempest-plugin-api:
+    tempest_horizon:
         flavor_ram: 1024
-    refstack_defcore:
+    tempest_neutron:
         flavor_ram: 1024
-    patrole:
+    tempest_cinder:
         flavor_ram: 1024
-    vmtp:
-        flavor_ram: 2048
-    shaker:
+    tempest_keystone:
+        flavor_ram: 1024
+    tempest_heat:
+        flavor_ram: 1024
+    tempest_telemetry:
         flavor_ram: 1024
-    neutron_trunk:
+    rally_sanity:
         flavor_ram: 1024
-    networking-bgpvpn:
+    refstack_compute:
         flavor_ram: 1024
-    networking-sfc:
+    refstack_object:
         flavor_ram: 1024
-    barbican:
+    refstack_platform:
         flavor_ram: 1024
     tempest_full:
         flavor_ram: 1024
     tempest_scenario:
         flavor_ram: 1024
-    rally_sanity:
+    tempest_slow:
+        flavor_ram: 1024
+    patrole:
+        flavor_ram: 1024
+    tempest_barbican:
+        flavor_ram: 1024
+    tempest_octavia:
+        flavor_ram: 1024
+    tempest_neutron_cntt:
+        flavor_ram: 1024
+    tempest_cinder_cntt:
+        flavor_ram: 1024
+    tempest_keystone_cntt:
+        flavor_ram: 1024
+    tempest_heat_cntt:
+        flavor_ram: 1024
+    rally_sanity_cntt:
+        flavor_ram: 1024
+    tempest_full_cntt:
+        flavor_ram: 1024
+    tempest_scenario_cntt:
+        flavor_ram: 1024
+    tempest_slow_cntt:
         flavor_ram: 1024
     rally_full:
         flavor_ram: 1024
+    rally_jobs:
+        flavor_ram: 1024
+    vmtp:
+        flavor_ram: 2048
+    shaker:
+        flavor_ram: 1024
+    rally_full_cntt:
+        flavor_ram: 1024
+    rally_jobs_cntt:
+        flavor_ram: 1024
 
 vio:
     vmready1:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     vmready2:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     singlevm1:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     singlevm2:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     vping_ssh:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     vping_userdata:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     cinder_test:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     tempest_smoke:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-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
+    tempest_horizon:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
-    refstack_defcore:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+    tempest_neutron:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
-    patrole:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+    tempest_cinder:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
-    vmtp:
-        image:
-            /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk
+    tempest_keystone:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-    shaker:
-        image: /home/opnfv/functest/images/shaker-image.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_heat:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-    neutron_trunk:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt:
+            /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.x86_64.vmdk
+        image_alt_format: vmdk
+    tempest_telemetry:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
-    networking-bgpvpn:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+    rally_sanity:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+    refstack_compute:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
-    networking-sfc:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+    refstack_object:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
-    barbican:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+    refstack_platform:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_full:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_scenario:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        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.4.0-x86_64-disk.vmdk
+    tempest_slow:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    patrole:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_barbican:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_octavia:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_neutron_cntt:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_cinder_cntt:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_keystone_cntt:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_heat_cntt:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt:
+            /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_format: vmdk
+    tempest_full_cntt:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_scenario_cntt:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_slow_cntt:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+        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.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_format: vmdk
+    rally_jobs:
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
+        image_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
+    rally_full_cntt:
+        image: /home/opnfv/functest/images/cirros-0.5.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_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
@@ -196,7 +490,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