commit 4c0e1405073bbd8c6abc9ef3c6378e9d92ea4334
author Xinyu Zhang <xinyu.zhang@arm.com> Mon Apr 26 11:46:47 2021 +0800
committer Fathi Boudra <fathi.boudra@linaro.org> Tue Apr 27 11:23:48 2021 +0200
tree 3ee184a2f5af95a9716a2f0c84a9bd97e21351c1
parent 7677cd6161fa61595368d3adad20796193667879

LAVA Submit: Re-Submit if Failed

LAVA-Submit job would occasionally fail with no reason.
Try to re-submit one more time to avoid blocking CI.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Id24e1eaba29501c09e6226b6831810ae1d06d30a

jenkins/lava-submit.jpl

diff --git a/jenkins/lava-submit.jpl b/jenkins/lava-submit.jpl
index 84eaf78..2671690 100644
--- a/jenkins/lava-submit.jpl
+++ b/jenkins/lava-submit.jpl
@@ -12,6 +12,24 @@
   return cause
 }
 
+def submitJobs(fvp_only_cmd, bl2_string, psa_string) {
+  dir("tf-m-ci-scripts") {
+    def res = sh(script: """./lava_helper/lava_create_jobs.py \
+      --build-number ${env.BUILD_NUMBER} --output-dir lava_jobs ${fvp_only_cmd}\
+      --compiler ${env.COMPILER} --platform ${env.TARGET_PLATFORM} \
+      ${bl2_string} ${psa_string} --build-type ${env.CMAKE_BUILD_TYPE} \
+      --jenkins-build-url ${env.BUILD_URL} --proj-config ${env.PROJ_CONFIG} \
+      --docker-prefix ${env.DOCKER_PREFIX} --license-variable "${env.LICENSE_VARIABLE}"
+      """, returnStdout: true).trim()
+    print(res)
+    job_ids = sh(script: """./lava_helper/lava_submit_jobs.py \
+      --lava-url ${env.LAVA_URL} --job-dir lava_jobs \
+      --lava-user ${LAVA_USER} --lava-token ${LAVA_TOKEN} | egrep "^JOBS"
+      """, returnStdout: true).trim()
+    currentBuild.setDescription(job_ids)
+  }
+}
+
 node("docker-amd64-tf-m-bionic") {
   stage("Init") {
     cleanWs()
@@ -20,7 +38,6 @@
     }
   }
   stage("LAVA") {
-
     def fvp_only_cmd = ""
     def upstreamProject = getUpstreamJob()[0].upstreamProject
     if (upstreamProject == "tf-m-build-and-test") {
@@ -39,20 +56,12 @@
       if (env.PSA_API_SUITE != "") {
         psa_string = "--psa-api-suite ${env.PSA_API_SUITE}"
       }
-      dir("tf-m-ci-scripts") {
-        def res = sh(script: """./lava_helper/lava_create_jobs.py \
---build-number ${env.BUILD_NUMBER} --output-dir lava_jobs ${fvp_only_cmd}\
---compiler ${env.COMPILER} --platform ${env.TARGET_PLATFORM} \
-${bl2_string} ${psa_string} --build-type ${env.CMAKE_BUILD_TYPE} \
---jenkins-build-url ${env.BUILD_URL} --proj-config ${env.PROJ_CONFIG} \
---docker-prefix ${env.DOCKER_PREFIX} --license-variable "${env.LICENSE_VARIABLE}"
-""", returnStdout: true).trim()
-        print(res)
-        job_ids = sh(script: """./lava_helper/lava_submit_jobs.py \
-  --lava-url ${env.LAVA_URL} --job-dir lava_jobs \
-  --lava-user ${LAVA_USER} --lava-token ${LAVA_TOKEN} | egrep "^JOBS"
-  """, returnStdout: true).trim()
-        currentBuild.setDescription(job_ids)
+      try {
+        submitJobs(fvp_only_cmd, bl2_string, psa_string)
+      } catch (Exception ex) {
+        print("LAVA-Submit failed! Exception: ${ex}")
+        print("Try to submit again...")
+        submitJobs(fvp_only_cmd, bl2_string, psa_string)
       }
     }
   }