Message ID | 20250411103028.2081593-1-Sai.Sathujoda@toshiba-tsip.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [isar-cip-core] scripts/submit_lava.sh: Set test shell timeout to 60 mins in case of M-COM | expand |
On 11.04.25 12:30, Sai.Sathujoda@toshiba-tsip.com wrote: > From: sai ashrith sathujoda <sai.sathujoda@toshiba-tsip.com> > > Based on recent observations, 40 minutes seems to be insufficent to run all > IEC test cases on M-COM x86. The test execution is quite slow when compared to > QEMU. So the timeout has been increased to 60 minutes in case of M-COM x86. > > Signed-off-by: sai ashrith sathujoda <sai.sathujoda@toshiba-tsip.com> > --- > scripts/submit_lava.sh | 2 ++ > tests/templates/IEC_template.yml | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/scripts/submit_lava.sh b/scripts/submit_lava.sh > index 0e437e0..61f08e3 100755 > --- a/scripts/submit_lava.sh > +++ b/scripts/submit_lava.sh > @@ -55,6 +55,7 @@ add_firmware_artifacts () { > create_job_qemu () { > if [ "$1" = "IEC" ]; then > cp $LAVA_TEMPLATES/IEC_template.yml "${job_dir}/${1}_${2}.yml" > + sed -i "s@#iec-tests-timeout#@40@g" "${job_dir}"/*.yml > > elif [ "$1" = "swupdate" ]; then > cp $LAVA_TEMPLATES/swupdate_template.yml "${job_dir}/${1}_${2}.yml" > @@ -163,6 +164,7 @@ create_job_mcom () { > cp $LAVA_TEMPLATES/M-COM-x86.yml "${job_dir}/${1}_${2}.yml" > if [ "$1" = "IEC" ]; then > grep -A 9 "# TEST_BLOCK" "$LAVA_TEMPLATES/$1_template.yml" >> "${job_dir}/${1}_${2}.yml" > + sed -i "s@#iec-tests-timeout#@60@g" "${job_dir}"/*.yml > elif [ "$1" = "secure-boot" ]; then > grep -A 1 "parameters" "$LAVA_TEMPLATES/secureboot_template.yml" >> "${job_dir}/${1}_${2}.yml" > else > diff --git a/tests/templates/IEC_template.yml b/tests/templates/IEC_template.yml > index 72901bb..e50f041 100644 > --- a/tests/templates/IEC_template.yml > +++ b/tests/templates/IEC_template.yml > @@ -60,7 +60,7 @@ actions: > # TEST_BLOCK > - test: > timeout: > - minutes: 40 > + minutes: #iec-tests-timeout# > definitions: > - repository: https://gitlab.com/cip-project/cip-testing/cip-security-tests.git > from: git Why not passing this value via the environment? This is what we do in xenomai-images: https://source.denx.de/Xenomai/xenomai-images/-/blob/857f36132697ff398a9de89b56c2a730f6e00ac4/scripts/run-lava-tests.sh#L41 https://source.denx.de/Xenomai/xenomai-images/-/blob/857f36132697ff398a9de89b56c2a730f6e00ac4/tests/jobs/xenomai-qemu-amd64.yml#L73 Jan
diff --git a/scripts/submit_lava.sh b/scripts/submit_lava.sh index 0e437e0..61f08e3 100755 --- a/scripts/submit_lava.sh +++ b/scripts/submit_lava.sh @@ -55,6 +55,7 @@ add_firmware_artifacts () { create_job_qemu () { if [ "$1" = "IEC" ]; then cp $LAVA_TEMPLATES/IEC_template.yml "${job_dir}/${1}_${2}.yml" + sed -i "s@#iec-tests-timeout#@40@g" "${job_dir}"/*.yml elif [ "$1" = "swupdate" ]; then cp $LAVA_TEMPLATES/swupdate_template.yml "${job_dir}/${1}_${2}.yml" @@ -163,6 +164,7 @@ create_job_mcom () { cp $LAVA_TEMPLATES/M-COM-x86.yml "${job_dir}/${1}_${2}.yml" if [ "$1" = "IEC" ]; then grep -A 9 "# TEST_BLOCK" "$LAVA_TEMPLATES/$1_template.yml" >> "${job_dir}/${1}_${2}.yml" + sed -i "s@#iec-tests-timeout#@60@g" "${job_dir}"/*.yml elif [ "$1" = "secure-boot" ]; then grep -A 1 "parameters" "$LAVA_TEMPLATES/secureboot_template.yml" >> "${job_dir}/${1}_${2}.yml" else diff --git a/tests/templates/IEC_template.yml b/tests/templates/IEC_template.yml index 72901bb..e50f041 100644 --- a/tests/templates/IEC_template.yml +++ b/tests/templates/IEC_template.yml @@ -60,7 +60,7 @@ actions: # TEST_BLOCK - test: timeout: - minutes: 40 + minutes: #iec-tests-timeout# definitions: - repository: https://gitlab.com/cip-project/cip-testing/cip-security-tests.git from: git