From a6b119633abb125fee71a82a5917b06bdd9c4d8e Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Fri, 12 May 2023 13:32:29 +0200
Subject: Remove notifier and metadata and use new qemu

Use the new qemu for dual-screen capability.

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I97a4d303bbc452902a4b555d00f05b0685e0e2de
---
 templates/base/agl-base-defaults.jinja2 | 2 +-
 templates/base/agl-base.jinja2          | 6 ------
 templates/boot/generic-base-boot.jinja2 | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'templates')

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' %}
-- 
cgit 1.2.3-korg