From 0c4f53e8aef52abb206e91af6715ef6feab7a8d4 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 9 May 2025 15:06:37 +0200 Subject: [PATCH] ci-tron: drop default timeouts Every job must define the right timeouts anyway, so it doesn't make sense to set these here. Additionally, the 90/100 minutes overall timeout was unreachable since the per-boot-cycle timeout was 45 minutes and there was no BOOT_CYCLE__RETRIES set, so no retry was possible. Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index f22b198eb49..cbc96edc31c 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -383,7 +383,6 @@ yaml-toml-shell-py-test: .ci-tron-test: extends: - .ci-tron-b2c-job-v1 - timeout: 1h 40m variables: GIT_STRATEGY: none B2C_VERSION: v0.9.15.1 # Linux 6.13.7 @@ -393,11 +392,9 @@ yaml-toml-shell-py-test: CI_TRON_PATTERN__JOB_SUCCESS__REGEX: 'hwci: mesa: pass, exit_code: 0\r$' CI_TRON_PATTERN__SESSION_END__REGEX: '^.*It''s now safe to turn off your computer\r$' - CI_TRON_TIMEOUT__BOOT_CYCLE__MINUTES: 45 CI_TRON_TIMEOUT__FIRST_CONSOLE_ACTIVITY__MINUTES: 2 CI_TRON_TIMEOUT__FIRST_CONSOLE_ACTIVITY__RETRIES: 3 CI_TRON_TIMEOUT__CONSOLE_ACTIVITY__MINUTES: 5 - CI_TRON_TIMEOUT__OVERALL__MINUTES: 90 CI_TRON__B2C_ARTIFACT_EXCLUSION: "*.shader_cache,install/*,*/install/*,*/vkd3d-proton.cache*,vkd3d-proton.cache*,*.qpa" CI_TRON_HTTP_ARTIFACT__INSTALL__PATH: "/install.tar.zst"