commit 97ee3fd34fe53f54586f842583836a1216043c6c
author Xinyu Zhang <xinyu.zhang@arm.com> Mon Dec 14 14:45:06 2020 +0800
committer Fathi Boudra <fathi.boudra@linaro.org> Mon Dec 14 15:38:22 2020 +0000
tree 589cf6d0d159448b67bdc3dc2a05d5bb8b234075
parent 11df53bffed450119080b9b25227d8ee2bef0ad8

Link Build Jobs and LAVA Jobs

It is hard to directly link Build and LAVA jobs through console log,
which makes it difficult to investigate errors when needed.

This patch is to link Build jobs and LAVA jobs.
It is more friendly to directly link corresponding build jobs and
LAVA jobs in console logs.

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

jenkins/ci.jpl

diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index ed34a79..9d215c7 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -186,6 +186,10 @@
       else {
         results['lava_jobs'] += lava_res.getDescription()
       }
+      links = "Build Config: ${config}\n"
+      links += "Build URL: ${build_url}\n"
+      links += "LAVA Submit: ${lava_res.getAbsoluteUrl()}"
+      print(links)
     }
   }
 }
@@ -386,6 +390,13 @@
   return result[0]
 }
 
+def showLinks(string) {
+  def lines = string.split("\n")
+  def result = lines.findAll { it.contains("Build Config: ")}
+  links = result.join("\n")
+  print(links)
+}
+
 def getResult(string, match) {
   line = lineInString(string, match)
   a = line.split(match)[1].split(' ')
@@ -482,6 +493,7 @@
   --lava-url ${env.LAVA_URL} --lava-user ${LAVA_USER} --lava-token ${LAVA_TOKEN} \
   --artifacts-path lava_artifacts --lava-timeout 7200 \
   """, returnStdout: true).trim()
+            showLinks(output)
             archiveArtifacts artifacts: 'test_summary.*', allowEmptyArchive: true
             archiveArtifacts artifacts: 'test_results.csv', allowEmptyArchive: true
             g = new Gerrit()

lava_helper/lava_wait_jobs.py

diff --git a/lava_helper/lava_wait_jobs.py b/lava_helper/lava_wait_jobs.py
index 1cd3345..e0fb12c 100755
--- a/lava_helper/lava_wait_jobs.py
+++ b/lava_helper/lava_wait_jobs.py
@@ -70,6 +70,7 @@
             finished_jobs[job] = info
     finished_jobs = fetch_artifacts(finished_jobs, user_args, lava)
     print_lava_urls(finished_jobs, user_args)
+    job_links(finished_jobs, user_args)
     boot_report(finished_jobs, user_args)
     test_report(finished_jobs, user_args, lava)
     failure_report(finished_jobs, user_args)
@@ -106,6 +107,14 @@
     else:
         return "FAIL"
 
+def job_links(jobs, user_args):
+    job_links = ""
+    for job, info in jobs.items():
+        job_links += "Build Config: {}  ".format(info['metadata']['build_name'])
+        job_links += "LAVA link: {}  ".format(lava_id_to_url(job, user_args))
+        job_links += "Build link: {}\n".format(info['metadata']['build_job_url'])
+    print(job_links)
+
 def csv_report(jobs):
     lava_jobs = []
     for job, info in jobs.items():