From 4297fe1d9d057c2b12cdd564bca9b693434ce161 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Wed, 31 Mar 2021 15:00:35 +0200
Subject: [PATCH] ci: Set more reasonable timeouts for LAVA jobs

The test timeout shouldn't be bigger than the whole job's timeout.

Also, reduce the timeouts to a more sane level and remove timeouts that
don't bring value.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9950>
---
 .gitlab-ci/lava.yml.jinja2 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/lava.yml.jinja2 b/.gitlab-ci/lava.yml.jinja2
index b0c81cd7d89..e9d54fe91a0 100644
--- a/.gitlab-ci/lava.yml.jinja2
+++ b/.gitlab-ci/lava.yml.jinja2
@@ -4,12 +4,7 @@ context:
   extra_nfsroot_args: " init=/init rootwait"
 timeouts:
   job:
-    minutes: 40
-  action:
-   minutes: 10
-  actions:
-    power-off:
-      seconds: 30
+    minutes: 30
 priority: 75
 visibility:
     group:
@@ -41,7 +36,7 @@ actions:
     os: oe
 - boot:
     timeout:
-      minutes: 5
+      minutes: 25
     method: {{ boot_method }}
 {% if boot_method == "fastboot" %}
 {#
@@ -58,7 +53,7 @@ actions:
       - 'lava-shell:'
 - test:
     timeout:
-      minutes: 60
+      minutes: 30
     definitions:
     - repository:
         metadata: