summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-05-12 13:32:29 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-05-12 13:33:16 +0200
commit98a8a4c346cb86f15a20cec9fe3a2f0c6325a8d9 (patch)
treedfdce5d25738a0ef1a39f0da55e0181ce9c1d38c
parent80c78c8b4316b530d0d2a48703e7469e548daff2 (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
-rw-r--r--templates/base/agl-base-defaults.jinja22
-rw-r--r--templates/base/agl-base.jinja26
-rw-r--r--templates/boot/generic-base-boot.jinja22
-rw-r--r--utils/agljobtemplate.py1
-rwxr-xr-xutils/create-jobs.py2
5 files changed, 4 insertions, 9 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' %}
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py
index 456f43e..34d7cbb 100644
--- a/utils/agljobtemplate.py
+++ b/utils/agljobtemplate.py
@@ -122,6 +122,7 @@ class Agljobtemplate(object):
url_fragment = ''
if (build_type == 'ci'):
url_fragment += changeid + '/' + patchset + '/'
+ #job['name'] = job_name + "-" + changeid + "-" + patchset
if not vcs_branch:
vcs_branch = 'master'
elif (build_type == 'snapshot' or build_type == 'weekly' or build_type == 'daily') and (not vcs_branch and not version):
diff --git a/utils/create-jobs.py b/utils/create-jobs.py
index f3a158f..1663035 100755
--- a/utils/create-jobs.py
+++ b/utils/create-jobs.py
@@ -42,7 +42,7 @@ def parse_cmdline(machines, tests, rfs_types):
parser.add_argument('-o', '--output', dest='job_file', action='store',
help="destination file")
parser.add_argument('-n', '--name', dest='job_name', action='store',
- help="job name", default='AGL-short-smoke-wip')
+ help="job name", default='AGL-short-smoke')
parser.add_argument('--rootfs-img', dest='rootfs_img', action='store',
help="The name of the root file system image (such as agl-demo-platform-raspberrypi3.ext4.xz)")
parser.add_argument('--kernel-img', dest='kernel_img', action='store',