From 0ce02f3d03318c9260d545682ab40dc381fbf614 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Thu, 23 May 2019 10:32:17 +0200 Subject: generic-qemu-tmpfs: add qemu_cpu and qemu_machine LAVA expect machine, memory and cpu to be passed as argument in context and not via extra args. This patchs introduce qemu_cpu, qemu_memory and qemu_machine as jinja variables. Change-Id: I8893943947a046f90be388febccfc29c7923d5b4 Bug-AGL: SPEC-2376 Signed-off-by: Corentin LABBE --- templates/boot/generic-qemu-tmpfs.jinja2 | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'templates/boot') diff --git a/templates/boot/generic-qemu-tmpfs.jinja2 b/templates/boot/generic-qemu-tmpfs.jinja2 index d981f46..f8cbd7d 100644 --- a/templates/boot/generic-qemu-tmpfs.jinja2 +++ b/templates/boot/generic-qemu-tmpfs.jinja2 @@ -12,6 +12,15 @@ context: no_kvm: false arch: {{ qemu_arch }} +{%- if qemu_cpu is defined %} + cpu: {{ qemu_cpu }} +{%- endif %} +{%- if qemu_machine is defined %} + machine: {{ qemu_machine }} +{%- endif %} +{%- if qemu_memory is defined %} + memory: {{ qemu_memory }} +{%- endif %} extra_options: ["{{ qemu_args }}"] {% endblock %} {%- block deploy -%} -- cgit 1.2.3-korg