From 645df9556da3bdcf32102bf043dd14a5a8cb67f7 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 22 Sep 2021 16:29:05 +0300 Subject: [PATCH] ci: bump test timeouts This is prompted by the spurious CI failure https://gitlab.freedesktop.org/wayland/weston/-/jobs/13891809 saying: 31/36 output-damage TIMEOUT 122.52s 8 subtests passed 32/36 output-transforms TIMEOUT 122.52s 16 subtests passed 33/36 subsurface TIMEOUT 122.52s 34/36 xwayland TIMEOUT 122.51s 35/36 ivi-shell-app TIMEOUT 122.51s ERROR: Job failed: execution took longer than 5m0s seconds That is hitting both kinds of timeouts at the same time: the per-test timeouts, and the CI job total timeout. That run seems to have had a particularly ill fortune, as a simple retry finished the same job in 2 minutes, and the longest running test took only 24 seconds. Nevertheless, by Daniel Stone's suggestion let's bump both timeouts: - the per-test timeout to 120 seconds, which with the multiplier in CI goes up to 8 minutes - the job timeout for all build related jobs to 15 minutes The timeout for tests_standalone is not bumped as we are not adding significant amounts of new tests there. Signed-off-by: Pekka Paalanen --- .gitlab-ci.yml | 2 +- tests/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88156481..3edae154 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,7 +157,7 @@ aarch64-debian-container_prep: # Core templates for all of our build steps. These are reused by all build jobs # through the `extends` keyword. .build-env: - timeout: 5m + timeout: 15m variables: BUILDDIR: $CI_PROJECT_DIR/build-weston-$CI_JOB_NAME PREFIX: $CI_PROJECT_DIR/prefix-weston-$CI_JOB_NAME diff --git a/tests/meson.build b/tests/meson.build index 0759f057..e3ee1d67 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -320,6 +320,7 @@ foreach t : tests t.get('name'), t_exe, depends: t.get('test_deps', []), + timeout: 120, protocol: 'tap' ) endforeach