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:32:29 +0200 |
| commit | a6b119633abb125fee71a82a5917b06bdd9c4d8e (patch) | |
| tree | 4899c585a87e4b95fbc75aed69af63edcbfc226d | |
| parent | 65ee84bb6e3f87021b09802c6672e95890e0d0eb (diff) | |
Remove notifier and metadata and use new qemuoctopus_15.0.5octopus_15.0.4octopus_15.0.3octopus/15.0.5octopus/15.0.4octopus/15.0.315.0.515.0.415.0.3octopus
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.jinja2 | 2 | ||||
| -rw-r--r-- | templates/base/agl-base.jinja2 | 6 | ||||
| -rw-r--r-- | templates/boot/generic-base-boot.jinja2 | 2 | ||||
| -rw-r--r-- | utils/agljobtemplate.py | 1 | ||||
| -rwxr-xr-x | utils/create-jobs.py | 2 |
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 67b4ca6..37e1f3a 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', |