radv/ci: reduce the execution timeout

We currently default to 4h of execution time, but this is unnecessary
on all our platforms. Tighten it to 45 minutes per run, and overall of
1.5h to allow for restarts.

Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16472>

.gitlab-ci/test/gitlab-ci.yml

@@ -187,6 +187,7 @@
   image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2022-03-03.2
   extends:
     - .use-debian/x86_test-vk
+  timeout: 1h 40m
   variables:
     # No need by default to pull the whole repo
     GIT_STRATEGY: none
@@ -199,12 +200,12 @@
     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_TIMEOUT_BOOT_MINUTES: 240
-    B2C_TIMEOUT_BOOT_RETRIES: 2
+    B2C_TIMEOUT_BOOT_MINUTES: 45
+    B2C_TIMEOUT_BOOT_RETRIES: 1
     B2C_TIMEOUT_FIRST_MINUTES: 5
     B2C_TIMEOUT_FIRST_RETRIES: 3
     B2C_TIMEOUT_MINUTES: 2
-    B2C_TIMEOUT_OVERALL_MINUTES: 240
+    B2C_TIMEOUT_OVERALL_MINUTES: 90
     B2C_TIMEOUT_RETRIES: 0
 
     # As noted in the top description, we make a distinction between the

src/amd/ci/gitlab-ci.yml

@@ -70,7 +70,9 @@ radv_stoney_vkcts:amd64:
   variables:
     # FIXME: Create this baseline for KABINI
     GPU_VERSION: radv-kabini-aco
+    B2C_TIMEOUT_BOOT_MINUTES: 360
     B2C_TIMEOUT_OVERALL_MINUTES: 360
+    B2C_TIMEOUT_BOOT_RETRIES: 0
     B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=8g'
   tags:
     - amdgpu:codename:KABINI
@@ -88,13 +90,15 @@ radv_stoney_vkcts:amd64:
     GPU_VERSION: radv-stoney-aco
     # Note, it only has a wee 32g disk!
     B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=8g'
+    B2C_TIMEOUT_BOOT_MINUTES: 240
+    B2C_TIMEOUT_OVERALL_MINUTES: 240
+    B2C_TIMEOUT_BOOT_RETRIES: 0
   tags:
     - amdgpu:codename:STONEY
 
 deqp-polaris10-valve:
   extends:
     - .deqp-test-valve
-  timeout: 3h 10m
   variables:
     GPU_VERSION: radv-polaris10-aco
     FDO_CI_CONCURRENT: 16
@@ -107,7 +111,6 @@ deqp-polaris10-valve:
 deqp-vega10-valve:
   extends:
     - .deqp-test-valve
-  timeout: 3h 10m
   variables:
     GPU_VERSION: radv-vega10-aco
     FDO_CI_CONCURRENT: 16
@@ -118,7 +121,6 @@ deqp-vega10-valve:
 deqp-renoir-valve:
   extends:
     - .deqp-test-valve
-  timeout: 2h 10m
   variables:
     GPU_VERSION: radv-renoir-aco
     FDO_CI_CONCURRENT: 24
@@ -129,7 +131,6 @@ deqp-renoir-valve:
 deqp-navi10-valve:
   extends:
     - .deqp-test-valve
-  timeout: 2h 10m
   variables:
     GPU_VERSION: radv-navi10-aco
     FDO_CI_CONCURRENT: 24
@@ -144,7 +145,6 @@ deqp-navi10-valve:
 deqp-navi21-valve:
   extends:
     - .deqp-test-valve
-  timeout: 2h 10m
   variables:
     GPU_VERSION: radv-sienna_cichlid-aco
     FDO_CI_CONCURRENT: 16
@@ -155,13 +155,12 @@ deqp-navi21-valve:
 deqp-vangogh-valve:
   extends:
     - .deqp-test-valve
-  timeout: 7h 10m
+  timeout: 2h 10m
   variables:
     GPU_VERSION: radv-vangogh-aco
     FDO_CI_CONCURRENT: 8
-    B2C_TIMEOUT_BOOT_MINUTES: 420     # 7 hours
-    B2C_TIMEOUT_OVERALL_MINUTES: 420  # 7 hours
-    B2C_TIMEOUT_MINUTES: 3
+    B2C_TIMEOUT_BOOT_MINUTES: 65
+    B2C_TIMEOUT_OVERALL_MINUTES: 120
     B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
   tags:
     - amdgpu:codename:VANGOGH