From 1db6521ee035f92a44eb0b3687072254e8ca5282 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Wed, 18 Mar 2020 16:26:36 +0100 Subject: Update timeouts based on job profile The current job workload can take more than 15 minutes to boot on e.g. qemuarm during firstboot. Signed-off-by: Jan-Simon Moeller Change-Id: If913db0a5984b1d4403cfb759797809a860bac6f (cherry picked from commit 917197d0e3a8e916e59784b418ecf5ef2f241043) --- templates/base/agl-base-defaults.jinja2 | 10 +++++----- templates/base/agl-base.jinja2 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2 index d86365f..87a5a89 100644 --- a/templates/base/agl-base-defaults.jinja2 +++ b/templates/base/agl-base-defaults.jinja2 @@ -1,14 +1,14 @@ {%- macro baseurl(object) -%} {{ urlbase }}/{{ object }} {%- endmacro %} -{%- set action_timeout = action_timeout|default(15) %} -{%- set boot_timeout = boot_timeout|default(15) %} +{%- 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(10) %} -{%- set deploy_timeout = deploy_timeout|default(60) %} +{%- set connection_timeout = connection_timeout|default(15) %} +{%- set deploy_timeout = deploy_timeout|default(90) %} {%- set device_type = device_type|default(yocto_machine+"-uboot") %} {%- set image_type = image_type|default("AGL") %} -{%- set job_timeout = job_timeout|default(120) %} +{%- set job_timeout = job_timeout|default(150) %} {%- set kernel_defconfig = kernel_defconfig|default("defconfig+CONFIG_AGL=y") %} {%- set kernel_defconfig_base = kernel_defconfig_base|default("defconfig") %} {%- set kernel_image = kernel_image|default('uImage') %} diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2 index 0bc7188..592970c 100644 --- a/templates/base/agl-base.jinja2 +++ b/templates/base/agl-base.jinja2 @@ -26,7 +26,7 @@ timeouts: minutes: {{ connection_timeout }} connections: lava-test-shell: - minutes: 10 + minutes: 15 priority: {{ priority }} visibility: public -- cgit 1.2.3-korg