diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-05-12 13:32:29 +0200 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-05-12 13:33:16 +0200 |
commit | 98a8a4c346cb86f15a20cec9fe3a2f0c6325a8d9 (patch) | |
tree | dfdce5d25738a0ef1a39f0da55e0181ce9c1d38c /templates | |
parent | 80c78c8b4316b530d0d2a48703e7469e548daff2 (diff) |
Remove notifier and metadata and use new qemupike_15.91.0pike/15.91.015.91.0
Use the new qemu for dual-screen capability.
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I97a4d303bbc452902a4b555d00f05b0685e0e2de
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base/agl-base-defaults.jinja2 | 2 | ||||
-rw-r--r-- | templates/base/agl-base.jinja2 | 6 | ||||
-rw-r--r-- | templates/boot/generic-base-boot.jinja2 | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2 index 01589e1..3d3409b 100644 --- a/templates/base/agl-base-defaults.jinja2 +++ b/templates/base/agl-base-defaults.jinja2 @@ -4,7 +4,7 @@ {%- set action_timeout = action_timeout|default(30) %} {%- set boot_timeout = boot_timeout|default(20) %} {%- set build_type = build_type|default("default") %} -{%- set connection_timeout = connection_timeout|default(15) %} +{%- set connection_timeout = connection_timeout|default(150) %} {%- set deploy_timeout = deploy_timeout|default(90) %} {%- set device_type = device_type|default(yocto_machine+"-uboot") %} {%- set image_type = image_type|default("AGL") %} diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2 index 346de32..2b4299c 100644 --- a/templates/base/agl-base.jinja2 +++ b/templates/base/agl-base.jinja2 @@ -1,11 +1,5 @@ {%- extends 'base/agl-base-defaults.jinja2' %} {%- block job %} -{%- block metadata %} -{% include 'base/agl-metadata.jinja2' %} -{% endblock %} -{% if do_callback %} -{% include 'base/agl-callback-section.jinja2' %} -{% endif %} {%- block main %} device_type: {{ device_type }} {%- if DEVICE_TAGS %} diff --git a/templates/boot/generic-base-boot.jinja2 b/templates/boot/generic-base-boot.jinja2 index d5f05a2..30e0b3a 100644 --- a/templates/boot/generic-base-boot.jinja2 +++ b/templates/boot/generic-base-boot.jinja2 @@ -22,7 +22,7 @@ context: method: {{ boot_method|default("u-boot") }} {%- if qemu_docker %} docker: - image: kernelci/qemu + image: dl9pf/qemu binary: {{ qemu_binary }} {%- endif %} {%- include 'boot/agl-prompt.jinja' %} |