From c1e7aeeada83d9f55248dd00da07bb5337136b54 Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Fri, 24 Mar 2023 13:42:39 +0000 Subject: [PATCH 1/2] ci: Add flasher timeout to ACS job Set the required timeout for the image pushed to SD card with the retry option. This fixes the issue with ACS job for N1SDP, where the deployer was timing out at 30 seconds. Signed-off-by: Vikas Katariya --- .gitlab/lava/n1sdp/acs_suite.yml.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/lava/n1sdp/acs_suite.yml.j2 b/.gitlab/lava/n1sdp/acs_suite.yml.j2 index 980ef1d..b69e294 100644 --- a/.gitlab/lava/n1sdp/acs_suite.yml.j2 +++ b/.gitlab/lava/n1sdp/acs_suite.yml.j2 @@ -44,6 +44,9 @@ actions: # - deploy: namespace: recovery + timeout: + minutes: 5 + failure_retry: 2 to: flasher images: recovery_image: -- GitLab From 630ab31a9a5c08ea48665c62ab467680d04bbb7b Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 4 Apr 2023 14:38:12 +0100 Subject: [PATCH 2/2] 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 --- .gitlab/lava/n1sdp/acs_suite.yml.j2 | 6 ++++++ .gitlab/lava/n1sdp/ptest.yml.j2 | 5 ++++- .gitlab/lava/n1sdp/sanity_job.yml.j2 | 7 ++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitlab/lava/n1sdp/acs_suite.yml.j2 b/.gitlab/lava/n1sdp/acs_suite.yml.j2 index b69e294..7282f9b 100644 --- a/.gitlab/lava/n1sdp/acs_suite.yml.j2 +++ b/.gitlab/lava/n1sdp/acs_suite.yml.j2 @@ -214,6 +214,9 @@ actions: # - deploy: namespace: recovery + timeout: + minutes: 5 + failure_retry: 2 to: flasher images: recovery_image: @@ -237,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..de66af7 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,6 +123,9 @@ actions: # - deploy: namespace: recovery + timeout: + minutes: 5 + failure_retry: 2 to: flasher timeout: minutes: 2 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