commit 32f8c1c1188286f82972305ff6a52f9246e68cd1
author Xinyu Zhang <xinyu.zhang@arm.com> Wed May 12 14:38:24 2021 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Wed May 12 15:10:37 2021 +0800
tree 1257e67323c28067d8ff5d00ce41889f62ccf9d6
parent ab21b8d4960591aa9cc28651d5b80f3ac4d3e159

LAVA-Submit: Print more logs to debug

Print logs in ci.jpl if LAVA job resubmitted.

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

jenkins/ci.jpl

diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 8131326..684a1cd 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -204,15 +204,24 @@
       params += string(name: 'CI_SCRIPTS_BRANCH', value: env.CI_SCRIPTS_BRANCH)
       params += string(name: 'LAVA_CREDENTIALS', value: env.LAVA_CREDENTIALS)
       def lava_res = build(job: 'tf-m-lava-submit', parameters: params, propagate: false)
+      def lava_resubmitted = false
       if (lava_res.result in failure_states) {
         error("LAVA Create and Submit failed at ${lava_res.getAbsoluteUrl()}")
       }
       else {
-        results['lava_jobs'] += lava_res.getDescription()
+        lava_des = lava_res.getDescription()
+        if (lava_des.contains(" Submitted twice!")) {
+          lava_resubmitted = true
+          lava_des = lava_des - " Submitted twice!"
+        }
+        results['lava_jobs'] += lava_des
       }
       links = "Build Config: ${config}\n"
       links += "Build URL: ${build_url}\n"
       links += "LAVA Submit: ${lava_res.getAbsoluteUrl()}"
+      if (lava_resubmitted) {
+        links += "\nLAVA Job Re-Submitted!"
+      }
       print(links)
     }
   }

jenkins/lava-submit.jpl

diff --git a/jenkins/lava-submit.jpl b/jenkins/lava-submit.jpl
index 2671690..9cd7571 100644
--- a/jenkins/lava-submit.jpl
+++ b/jenkins/lava-submit.jpl
@@ -62,6 +62,7 @@
         print("LAVA-Submit failed! Exception: ${ex}")
         print("Try to submit again...")
         submitJobs(fvp_only_cmd, bl2_string, psa_string)
+        currentBuild.setDescription(currentBuild.getDescription() + " Submitted twice!")
       }
     }
   }