From 3b5fb51fbc77e54cd428246dd1c5c2c3800dad55 Mon Sep 17 00:00:00 2001
From: Vikas Katariya <vikas.katariya@arm.com>
Date: Thu, 30 Mar 2023 15:36:15 +0100
Subject: [PATCH] ci: Update timeout and retry option for flasher (N1SDP)

Align ACS, ptest and Sanity jobs with similar flashing firmware
timeout minutes and retry option.

Signed-off-by: Vikas Katariya <vikas.katariya@arm.com>
---
 .gitlab/lava/n1sdp/acs_suite.yml.j2  | 11 +++++++++--
 .gitlab/lava/n1sdp/ptest.yml.j2      |  7 ++++---
 .gitlab/lava/n1sdp/sanity_job.yml.j2 |  7 ++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.gitlab/lava/n1sdp/acs_suite.yml.j2 b/.gitlab/lava/n1sdp/acs_suite.yml.j2
index 83a10dc..7282f9b 100644
--- a/.gitlab/lava/n1sdp/acs_suite.yml.j2
+++ b/.gitlab/lava/n1sdp/acs_suite.yml.j2
@@ -43,9 +43,10 @@ actions:
 # enables an EFI network driver, allowing us to force a TFTP boot from GRUB (assuming cobbler is setup)
 #
 - deploy:
-    timeout:
-      seconds: 120
     namespace: recovery
+    timeout:
+      minutes: 5
+    failure_retry: 2
     to: flasher
     images:
       recovery_image:
@@ -213,6 +214,9 @@ actions:
 #
 - deploy:
     namespace: recovery
+    timeout:
+      minutes: 5
+    failure_retry: 2
     to: flasher
     images:
       recovery_image:
@@ -236,6 +240,9 @@ actions:
 
 - deploy:
     namespace: recovery
+    timeout:
+      minutes: 5
+    failure_retry: 2
     to: flasher
     images:
       recovery_image:
diff --git a/.gitlab/lava/n1sdp/ptest.yml.j2 b/.gitlab/lava/n1sdp/ptest.yml.j2
index 3646c7b..6f666c9 100644
--- a/.gitlab/lava/n1sdp/ptest.yml.j2
+++ b/.gitlab/lava/n1sdp/ptest.yml.j2
@@ -41,7 +41,7 @@ actions:
 - deploy:
     namespace: recovery
     timeout:
-      minutes: 10
+      minutes: 5
     failure_retry: 2
     to: flasher
     images:
@@ -123,9 +123,10 @@ actions:
 #
 - deploy:
     namespace: recovery
-    to: flasher
     timeout:
-      minutes: 2
+      minutes: 5
+    failure_retry: 2
+    to: flasher
     images:
       recovery_image:
         url: "{{ FIRMWARE_ARTIFACT }}"
diff --git a/.gitlab/lava/n1sdp/sanity_job.yml.j2 b/.gitlab/lava/n1sdp/sanity_job.yml.j2
index a56d7d6..d409b69 100644
--- a/.gitlab/lava/n1sdp/sanity_job.yml.j2
+++ b/.gitlab/lava/n1sdp/sanity_job.yml.j2
@@ -41,7 +41,7 @@ actions:
 - deploy:
     namespace: recovery
     timeout:
-      minutes: 10
+      minutes: 5
     failure_retry: 2
     to: flasher
     images:
@@ -123,9 +123,10 @@ actions:
 #
 - deploy:
     namespace: recovery
-    to: flasher
     timeout:
-      minutes: 2
+      minutes: 5
+    failure_retry: 2
+    to: flasher
     images:
       recovery_image:
         url: "{{ FIRMWARE_ARTIFACT }}"
-- 
GitLab