From a27f739de3e950dd7d387edc6e6543774b53baa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Sat, 29 Mar 2025 07:10:56 +0200 Subject: [PATCH] radv/ci: move the vangogh timeouts to the jobs No idea why we ended up having timeouts set in gitlab-ci-inc.yml, but this isn't right as they are only applicable to jobs. Part-of: --- src/amd/ci/gitlab-ci-inc.yml | 2 -- src/amd/ci/gitlab-ci.yml | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index 982deaa990a..8942a6af97a 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -399,8 +399,6 @@ RUNNER_FARM_LOCATION: mupuf B2C_MARS_SETUP_TAGS: amdgpu:codename:VANGOGH FDO_CI_CONCURRENT: 8 - B2C_TIMEOUT_BOOT_MINUTES: 85 - B2C_TIMEOUT_OVERALL_MINUTES: 120 B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' tags: - farm:$RUNNER_FARM_LOCATION diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index f61d5cfe512..58b0e7c5f95 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -272,11 +272,13 @@ radv-vangogh-vkcts: - .b2c-test-radv-vk - .vangogh-test-valve - .radv-valve-manual-rules - timeout: 2h 10m + timeout: 90m variables: DEQP_SUITE: radv-valve GPU_VERSION: radv-vangogh RADV_PERFTEST: transfer_queue + B2C_TIMEOUT_BOOT_MINUTES: 85 + B2C_TIMEOUT_OVERALL_MINUTES: 89 radeonsi-vangogh-glcts-full: extends: @@ -288,6 +290,8 @@ radeonsi-vangogh-glcts-full: variables: GPU_VERSION: radeonsi-vangogh DEQP_SUITE: radeonsi-vangogh + B2C_TIMEOUT_BOOT_MINUTES: 85 + B2C_TIMEOUT_OVERALL_MINUTES: 89 radeonsi-vangogh-glcts: extends: @@ -296,6 +300,8 @@ radeonsi-vangogh-glcts: timeout: 30m variables: DEQP_FRACTION: 4 + B2C_TIMEOUT_BOOT_MINUTES: 28 + B2C_TIMEOUT_OVERALL_MINUTES: 29 radv-raphael-vkcts: extends: