From 3d35649b26102666d55af6c27fdaeb60e3547fc3 Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Wed, 22 Feb 2023 11:51:27 +0000 Subject: [PATCH 1/3] ci: Update login prompt in mps3 lava job to fix timeouts The login prompt string in mps3 lava job is incorrect and this is causing mps3 jobs to fail on few instances. This patch uses the correct string in ptest and sanity jobs for mps3. Signed-off-by: Gowtham Suresh Kumar --- .gitlab/lava/corstone1000-mps3/ptest.yml.j2 | 2 +- .gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 b/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 index 9a702f6..03a33e0 100644 --- a/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 +++ b/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 @@ -131,7 +131,7 @@ actions: timeout: minutes: 480 auto_login: - login_prompt: 'CASSINI unstable corstone1000-mps3 ttyAMA0' + login_prompt: 'corstone1000-mps3 login:.*' username: cassini login_commands: - cassini123 diff --git a/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 b/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 index d7594ff..6e67ed2 100644 --- a/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 +++ b/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 @@ -131,7 +131,7 @@ actions: timeout: minutes: 480 auto_login: - login_prompt: 'CASSINI unstable corstone1000-mps3 ttyAMA0' + login_prompt: 'corstone1000-mps3 login:.*' username: cassini login_commands: - cassini123 -- GitLab From 7e7944950a67c5c78f76080a4edc5048ba16000d Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Wed, 1 Mar 2023 11:07:42 +0000 Subject: [PATCH 2/3] ci: Update login prompt for ptests Only the security tests need new password for users logging in for the first time. As the same j2 template is used for both security test and generic test, the generic tests fail due to missing password prompt. So this commit adds a new prompt for the generic test where we need to enter password directly. Signed-off-by: Gowtham Suresh Kumar --- .gitlab/lava/corstone1000-mps3/ptest.yml.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 b/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 index 03a33e0..96c376f 100644 --- a/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 +++ b/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 @@ -138,6 +138,7 @@ actions: - cassini123 - sudo su prompts: + - 'Password: ' - 'New password: ' - 'Re-enter new password: ' - '(.*)corstone1000-mps3:' -- GitLab From 869114ff021ef2113a0585a6d5289dd7e0436c24 Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Wed, 1 Mar 2023 11:12:26 +0000 Subject: [PATCH 3/3] ci: Increase timeout for sanity job Some of the jobs fail with the current timeouts in the sanity job. This commit adds some additional time to pass the jobs consistently. Signed-off-by: Gowtham Suresh Kumar --- .gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 b/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 index 6e67ed2..d551846 100644 --- a/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 +++ b/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 @@ -7,7 +7,7 @@ device_type: mps3 job_name: {{ CI_JOB_NAME }} timeouts: job: - minutes: 560 + minutes: 680 metadata: source: {{ CI_PROJECT_URL }} @@ -129,7 +129,7 @@ actions: namespace: secondary_media method: minimal timeout: - minutes: 480 + minutes: 580 auto_login: login_prompt: 'corstone1000-mps3 login:.*' username: cassini -- GitLab