From 3409f9416f64b70d3548bcb7dab0ad4f47629035 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Thu, 30 Apr 2020 09:29:19 +0200 Subject: SPEC-3210: qemu do not use ramdisk On 2020.02, qemu jobs fail to mount the rootfs. This is due to LAVA ignore now compression for ramdisk and the AGL image is in xz. But AGL qemu jobs in fact does not use a ramdisk but a virtio disk. Renaming the ramdisk definition entry to rootvd handle this issue. Furthermore, let's introduce a new rootfs type rootvd. Change-Id: I71ef6dee0d859c6aa0b29f1d47ac14dd4db900d8 Bug-AGL: SPEC-3210 Signed-off-by: Corentin LABBE --- templates/boot/generic-qemu-tmpfs.jinja2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'templates/boot/generic-qemu-tmpfs.jinja2') diff --git a/templates/boot/generic-qemu-tmpfs.jinja2 b/templates/boot/generic-qemu-tmpfs.jinja2 index e39802d..b89ac60 100644 --- a/templates/boot/generic-qemu-tmpfs.jinja2 +++ b/templates/boot/generic-qemu-tmpfs.jinja2 @@ -32,9 +32,9 @@ context: kernel: image_arg: '-kernel {kernel} -append "{{ qemu_cmdline }}"' url: {{ kernel_url }} -{%- if initrd_url and rootfs_type == 'ramdisk' %} - ramdisk: - image_arg: '-drive format=raw,file={ramdisk}' +{%- if initrd_url and rootfs_type == 'rootvd' %} + rootvd: + image_arg: '-drive format=raw,file={rootvd}' url: {{ initrd_url }} compression: {{ initrd_compression }} {%- endif %} -- cgit 1.2.3-korg