summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-06-21 20:07:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-21 20:07:51 +0000
commite5f28f769cf230af91cdd6651e19c64fba22e5a2 (patch)
tree193da87df96b6edfae85d01d60067f9379d5e522
parent518ad1e201389ecef17c0770a94793315d0d0fd7 (diff)
parentdfc139f345774cc8c59c176db957a446d3684880 (diff)
Merge "Update patches"
-rw-r--r--functest/ci/config_aarch64_patch.yaml17
-rw-r--r--functest/ci/config_patch.yaml13
2 files changed, 30 insertions, 0 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 983461d78..928026c90 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -13,6 +13,23 @@ os:
short_id: 'ubuntu16.04'
hw_disk_bus: 'scsi'
hw_scsi_model: 'virtio-scsi'
+
+ singlevm1:
+ image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+ extra_properties:
+ hw_firmware_type: 'uefi'
+ hw_video_model: 'vga'
+ hw_disk_bus: 'scsi'
+ hw_scsi_model: 'virtio-scsi'
+
+ singlevm2:
+ image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+ extra_properties:
+ hw_firmware_type: 'uefi'
+ hw_video_model: 'vga'
+ hw_disk_bus: 'scsi'
+ hw_scsi_model: 'virtio-scsi'
+
snaps:
images:
glance_tests:
diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index dfd441b57..a29b299cb 100644
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -12,9 +12,22 @@ fdio:
image_properties: {'hw_mem_page_size':'large'}
openstack:
flavor_ram: 1024
+ singlevm1:
+ flavor_extra_specs: {'hw:mem_page_size':'large'}
+ extra_properties: {'hw_mem_page_size':'large'}
+ singlevm2:
+ flavor_extra_specs: {'hw:mem_page_size':'large'}
+ extra_properties: {'hw_mem_page_size':'large'}
+
ovs:
general:
flavor_extra_specs: {'hw:mem_page_size':'large'}
image_properties: {'hw_mem_page_size':'large'}
openstack:
flavor_ram: 1024
+ singlevm1:
+ flavor_extra_specs: {'hw:mem_page_size':'large'}
+ extra_properties: {'hw_mem_page_size':'large'}
+ singlevm2:
+ flavor_extra_specs: {'hw:mem_page_size':'large'}
+ extra_properties: {'hw_mem_page_size':'large'}