From dfc139f345774cc8c59c176db957a446d3684880 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Thu, 21 Jun 2018 21:43:55 +0200
Subject: [PATCH] Update patches
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
It patches specific values for singlevm1 and singlevm2 (arm64, ovs
and fdio).
Change-Id: Ibbd827b52520410bbbfa231eec23b08aeb511e0b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
functest/ci/config_aarch64_patch.yaml | 17 +++++++++++++++++
functest/ci/config_patch.yaml | 13 +++++++++++++
2 files changed, 30 insertions(+)
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'}
--
2.16.6