Update templates for screenshot tests

- qemu needs the mem= kernel parameter to work nicely
- pyagl needs a larger timeout
- pi4 needs an adapted rfs_image for snapshot builds

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: Ida3ac188008c72d941dbe30203e5b8700ee8a304

4 files changed, 5 insertions, 5 deletions

diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2
index da7f313..ae7398c 100644
--- a/templates/machines/qemuarm.jinja2
+++ b/templates/machines/qemuarm.jinja2
@@ -11,7 +11,7 @@
 {%- set qemu_machine = "virt-2.11" %}
 {%- set qemu_memory = "4096" %}
 {%- set qemu_args = "-smp 2 -soundhw hda -device usb-ehci -device virtio-rng-pci -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd" %}
-{%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false vmalloc=256M " %}
+{%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false mem=4096M vmalloc=256M " %}
 {%- set guestfs_interface = "virtio" %}
 {%- set rootfs_type = rootfs_type|default("rootvd") %}
 {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
diff --git a/templates/machines/qemuarm64.jinja2 b/templates/machines/qemuarm64.jinja2
index 73e13c2..f463382 100644
--- a/templates/machines/qemuarm64.jinja2
+++ b/templates/machines/qemuarm64.jinja2
@@ -9,9 +9,9 @@
 {%- set qemu_model = "model=virtio" %}
 {%- set qemu_cpu = "cortex-a57" %}
 {%- set qemu_machine = "virt" %}
-{%- set qemu_memory = "2048" %}
+{%- set qemu_memory = "4096" %}
 {%- set qemu_args = "-smp 2 -soundhw hda -device usb-ehci -device virtio-rng-pci -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd " %}
-{%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %}
+{%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose mem=4096M systemd.log_color=false " %}
 {%- set guestfs_interface = "virtio" %}
 {%- set rootfs_type = rootfs_type|default("rootvd") %}
 {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
diff --git a/templates/machines/raspberrypi4.jinja2 b/templates/machines/raspberrypi4.jinja2
index 12cdc09..7f04b8f 100644
--- a/templates/machines/raspberrypi4.jinja2
+++ b/templates/machines/raspberrypi4.jinja2
@@ -10,7 +10,7 @@
     {%- set initrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz" %}
 {%- endif %}
 {%- set dtb = dtb|default("bcm2711-rpi-4-b+vc4.dtb") %}
-{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'prerelease') %}
+{%- if (build_type == 'snapshot') or (build_type == 'daily') or (build_type == 'release') or (build_type == 'prerelease') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-" + yocto_machine + ".ext4.xz") %}
 {%- else %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-" + yocto_machine + ".ext4.xz") %}
diff --git a/templates/tests/pyagl.jinja2 b/templates/tests/pyagl.jinja2
index 410241a..e080ebd 100644
--- a/templates/tests/pyagl.jinja2
+++ b/templates/tests/pyagl.jinja2
@@ -1,6 +1,6 @@
 - test:
     timeout:
-      minutes: 10
+      minutes: 15
     definitions:
     - repository: https://git.automotivelinux.org/src/qa-testdefinitions
       from: git