From 09021a1c019f19ee98f75e58f4da40387015449f 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_FIRST_* to B2C_TIMEOUT_FIRST_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 b0a96447117..dbc99102508 100644 --- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 +++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 @@ -6,8 +6,8 @@ target: timeouts: first_console_activity: # This limits the time it can take to receive the first console log - minutes: {{ timeout_first_minutes }} - retries: {{ timeout_first_retries }} + 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 }} diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index a87f8b92c49..fc73f1bd5ce 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -298,8 +298,8 @@ python-test: B2C_SESSION_REBOOT_REGEX: '' B2C_TIMEOUT_BOOT_MINUTES: 45 B2C_TIMEOUT_BOOT_RETRIES: 0 - B2C_TIMEOUT_FIRST_MINUTES: 2 - B2C_TIMEOUT_FIRST_RETRIES: 3 + B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_MINUTES: 2 + B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3 B2C_TIMEOUT_MINUTES: 5 B2C_TIMEOUT_OVERALL_MINUTES: 90 B2C_TIMEOUT_RETRIES: 0