From c4ead6d7031d8c2d24a048c2e6225d8c7643e79f Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 9 May 2025 12:05:10 +0200
Subject: [PATCH] nvk/ci: tighten job timeouts a little bit

Since nvk got faster, and job duration is incredibly stable.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34880>
---
 src/gallium/drivers/zink/ci/gitlab-ci.yml |  6 +++---
 src/nouveau/ci/gitlab-ci.yml              | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 2e0cade3716..6f3d1c046d9 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -200,15 +200,15 @@ zink-tu-a750:
 
 ############### Combined testing (GL, GLES, Piglit) on NVK / RADV
 zink-nvk-ga106-valve:
-  timeout: 60m
+  timeout: 45m
   extends:
     - .zink-nvk-test-valve
     - .zink-nvk-manual-rules
     - .nvk-ga106-valve
   variables:
     GPU_VERSION: zink-nvk-ga106
-    CI_TRON_TIMEOUT__BOOT_CYCLE__MINUTES: 50
-    CI_TRON_TIMEOUT__OVERALL__MINUTES: 55  # usual run time: 35min
+    CI_TRON_TIMEOUT__BOOT_CYCLE__MINUTES: 40
+    CI_TRON_TIMEOUT__OVERALL__MINUTES: 40  # usual run time: 32min
 
 zink-radv-polaris10-valve:
   extends:
diff --git a/src/nouveau/ci/gitlab-ci.yml b/src/nouveau/ci/gitlab-ci.yml
index 5fa7b62522e..a21c0ea9d75 100644
--- a/src/nouveau/ci/gitlab-ci.yml
+++ b/src/nouveau/ci/gitlab-ci.yml
@@ -7,10 +7,10 @@ nvk-ga106-vkcts-valve:
     - .nvk-vkcts
     - .nvk-ga106-valve
     - .nvk-valve-manual-rules
-  timeout: 120m  # current runtime is ~70min
+  timeout: 80m
   variables:
-    CI_TRON_TIMEOUT__BOOT_CYCLE__MINUTES: 110
-    CI_TRON_TIMEOUT__OVERALL__MINUTES: 115
+    CI_TRON_TIMEOUT__BOOT_CYCLE__MINUTES: 75
+    CI_TRON_TIMEOUT__OVERALL__MINUTES: 75  # usual run time: 56min
 
 nvk-ga106-vkd3d-valve:
   extends:
@@ -18,10 +18,10 @@ nvk-ga106-vkd3d-valve:
     - .nvk-vkcts
     - .nvk-ga106-valve
     - .nvk-valve-manual-rules
-  timeout: 15m  # base runtime 7min
+  timeout: 15m
   variables:
     HWCI_TEST_SCRIPT: install/vkd3d-runner.sh
     CI_TRON_TIMEOUT__BOOT_CYCLE__MINUTES: 10
-    CI_TRON_TIMEOUT__OVERALL__MINUTES: 12
+    CI_TRON_TIMEOUT__OVERALL__MINUTES: 10  # usual run time: 5.5min
     # Random tests fail/crash when trying to run them in parallel
     FDO_CI_CONCURRENT: 1