summaryrefslogtreecommitdiffstats
path: root/templates/machines/qemux86-64.jinja2
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2020-04-30 09:29:19 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-05-04 16:12:22 +0000
commit3409f9416f64b70d3548bcb7dab0ad4f47629035 (patch)
tree40369a687bb3e197465e0b7f66570cd68c40165d /templates/machines/qemux86-64.jinja2
parentacf5aa2e36816d6cc2bddec375e095f064341390 (diff)
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 <clabbe@baylibre.com>
Diffstat (limited to 'templates/machines/qemux86-64.jinja2')
-rw-r--r--templates/machines/qemux86-64.jinja22
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2
index fb82011..a1e3f5c 100644
--- a/templates/machines/qemux86-64.jinja2
+++ b/templates/machines/qemux86-64.jinja2
@@ -8,7 +8,7 @@
{%- set qemu_arch = "x86_64" %}
{%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci" %}
{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda verbose systemd.log_color=false rw fstab=no no_timer_check" %}
-{%- set rootfs_type = rootfs_type|default("ramdisk") %}
+{%- set rootfs_type = rootfs_type|default("rootvd") %}
{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemux86-64.ext4.xz") %}
{%- else %}