From fe5a8ac48f8c74ae4975e34976023ce2f6c5e8fa Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Mon, 6 Dec 2021 17:41:28 +0100 Subject: Add workaround for weston watchdog for emulation in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The emulated workers are slower than real hardware, thus extend the timeout. Bug-AGL: SPEC-4165 Signed-off-by: Jan-Simon Möller Change-Id: I4113d1ad28964efb31a55121ff3dbb1a29893a6f --- templates/tests/fixup-weston-watchdog.jinja2 | 19 +++++++++++++++++++ utils/agljobtemplate.py | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 templates/tests/fixup-weston-watchdog.jinja2 diff --git a/templates/tests/fixup-weston-watchdog.jinja2 b/templates/tests/fixup-weston-watchdog.jinja2 new file mode 100644 index 0000000..ce403b4 --- /dev/null +++ b/templates/tests/fixup-weston-watchdog.jinja2 @@ -0,0 +1,19 @@ +- test: + failure_retry: 3 + definitions: + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: fixup-weston-watchdog + description: "extend watchdog on virtual" + run: + steps: + - sed -i -e "s#WatchdogSec=20#WatchdogSec=60#g" /lib/systemd/system/weston.service + - systemctl daemon-reload + - systemctl restart weston.service + - sleep 60 + - journalctl --no-pager -a -b + from: inline + name: fixup-weston-watchdog + path: inline/fixup-weston-watchdog.yaml + diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index c25dc9f..456f43e 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -184,8 +184,11 @@ class Agljobtemplate(object): if section[0] == "test_plan": tests = ast.literal_eval(section[1]) + if 'all' in tests: tests = self.tests + if machine == 'qemuarm' or machine == 'qemuarm64': + tests.insert(0, "fixup-weston-watchdog") for t in tests: if machine == 'bbe' and t == 'screenshooter': continue -- cgit 1.2.3-korg