Limits test timeout for pp_test
When pp_test is the only filter group, the lava timeout is set to 45 mins,
previously this was only for the tf-m-static job, but would wait the full 5.5h
when the job had been manually triggered (even with parameters the same).
Signed-off-by: Matthew Dalzell <matthew.dalzell@arm.com>
Change-Id: I98e5fbe5b5e6197cd3c8af9af37aae98f6427f0e
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index f6ec1bf..0da1e27 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -393,11 +393,12 @@
output = ""
if (all_jobs.size() > 0) {
dir(".") {
- if (isPerPatchJob()) {
+ if (env.FILTER_GROUP == "pp_test") {
lava_timeout = 2700 // 45min
} else {
lava_timeout = 19800 // 5.5h
}
+ println("Waiting for up to ${lava_timeout/60} minutes.")
withCredentials([usernamePassword(credentialsId: env.LAVA_CREDENTIALS, passwordVariable: 'LAVA_TOKEN', usernameVariable: 'LAVA_USER')]) {
sh(script: """./tf-m-ci-scripts/lava_helper/lava_wait_jobs.py --job-ids ${all_jobs.join(",")} \
--lava-url ${env.LAVA_URL} --lava-user \${LAVA_USER} --lava-token \${LAVA_TOKEN} \