From 369c1fd495c6d15a2bfaef2e0948122b499ddae6 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 21 Aug 2024 11:53:13 +0200
Subject: [PATCH] etnaviv/ci: fix gc2000_piglit test timeout

Setting it to the same value as (or higher than) the job timeout
effectively bypasses the safety mechanism.

Let's change it to `job timeout - 5min`.

Fixes: f39ffc69110d1da0d87f ("ci/etnaviv: Get the gc2000_piglit manual job mostly working.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30800>
(cherry picked from commit b978d3eb54b081228d040e58f722d2007f331e84)
---
 .pick_status.json            | 2 +-
 src/etnaviv/ci/gitlab-ci.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index fe0757ff637..46f1b9578d4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -394,7 +394,7 @@
         "description": "etnaviv/ci: fix gc2000_piglit test timeout",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f39ffc69110d1da0d87f970bc87802ca81ce9fa9",
         "notes": null
diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 42e16a253ce..62b6b4cacc7 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -86,7 +86,7 @@ gc2000_piglit:
   variables:
     DEQP_SUITE: etnaviv-gc2000-piglit
     FLAKES_CHANNEL: "#etnaviv-ci"
-    TEST_PHASE_TIMEOUT: 40
+    TEST_PHASE_TIMEOUT: 35
   timeout: 40m
 
 gc7000_gles2: