From b50aa918f42713aa50af10bb39c6e28dac3f6129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Mon, 20 Jun 2022 17:06:00 +0300 Subject: [PATCH] radv/ci: do not reboot on soft-recovered hangs, just warn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The job will still fail, but it will at least go through until the end. Signed-off-by: Martin Roukala (né Peres) Acked-by: Timur Kristóf Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index d892561006d..4d72836069a 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -210,11 +210,11 @@ B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/144/download' # 5.17.1 B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.6/downloads/initramfs.linux_amd64.cpio.xz' B2C_JOB_SUCCESS_REGEX: '\[.*\]: Execution is over, pipeline status: 0\r$' - B2C_JOB_WARN_REGEX: 'null' + B2C_JOB_WARN_REGEX: '\*ERROR\* ring .* timeout, but soft recovered' B2C_LOG_LEVEL: 6 B2C_POWEROFF_DELAY: 15 B2C_SESSION_END_REGEX: '^.*It''s now safe to turn off your computer\r$' - B2C_SESSION_REBOOT_REGEX: '(GPU hang detected!|\*ERROR\* ring [^\s]+ timeout|The CS has been cancelled because the context is lost)' + B2C_SESSION_REBOOT_REGEX: '(GPU hang detected!|\*ERROR\* ring [^\s]+ timeout(?!, but soft recovered)|The CS has been cancelled because the context is lost)' B2C_TIMEOUT_BOOT_MINUTES: 45 B2C_TIMEOUT_BOOT_RETRIES: 1 B2C_TIMEOUT_FIRST_MINUTES: 5