From 9a07db7cd8e1c6b4e4b48c536822ec0ad63dc93e Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 2 May 2024 15:29:56 +0200 Subject: [PATCH] ci/b2c: rename B2C_TIMEOUT_* to B2C_TIMEOUT_CONSOLE_ACTIVITY_* More verbose, sure, but also much easier to understand. Part-of: --- .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 | 4 ++-- .gitlab-ci/test/gitlab-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 index dbc99102508..ae597f01599 100644 --- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 +++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 @@ -9,8 +9,8 @@ timeouts: minutes: {{ timeout_first_console_activity_minutes }} retries: {{ timeout_first_console_activity_retries }} console_activity: # Reset every time we receive a message from the logs - minutes: {{ timeout_minutes }} - retries: {{ timeout_retries }} + minutes: {{ timeout_console_activity_minutes }} + retries: {{ timeout_console_activity_retries }} boot_cycle: minutes: {{ timeout_boot_minutes }} retries: {{ timeout_boot_retries }} diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index fc73f1bd5ce..5c0b2df99ae 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -300,9 +300,9 @@ python-test: B2C_TIMEOUT_BOOT_RETRIES: 0 B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_MINUTES: 2 B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3 - B2C_TIMEOUT_MINUTES: 5 + B2C_TIMEOUT_CONSOLE_ACTIVITY_MINUTES: 5 B2C_TIMEOUT_OVERALL_MINUTES: 90 - B2C_TIMEOUT_RETRIES: 0 + B2C_TIMEOUT_CONSOLE_ACTIVITY_RETRIES: 0 B2C_JOB_VOLUME_EXCLUSIONS: "*.shader_cache,install/*,*/install/*,*/vkd3d-proton.cache*,vkd3d-proton.cache*,*.qpa" # As noted in the top description, we make a distinction between the