commit e9033f613fc229bf38a974bce60d124af22de273
author Xinyu Zhang <xinyu.zhang@arm.com> Sat Oct 08 11:15:27 2022 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Sat Oct 08 11:45:21 2022 +0800
tree e4b350bcfa933dbdde2ef79478cbb45c212d3baf
parent b0d738ca2d1860a11dc3903687317d3371963c53

Test: Get build URL via system ENV

Build job URL is available via Jenkins system ENV. So it can be obtained
directly in Python scripts.

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

jenkins/ci.jpl

diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index eb45b5d..d9bdf16 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -549,7 +549,7 @@
     --artifacts-path cfgs --lava-timeout 12000 \
     """, returnStdout: true).trim()
               println("--- output from lava_wait_jobs.py ---")
-              println(output.replace("<BUILD_ARTIFACT_URL>", "${env.BUILD_URL}artifact/"))
+              println(output)
               println("--- end of output from lava_wait_jobs.py ---")
               archiveArtifacts artifacts: 'test_summary.*', allowEmptyArchive: true
               archiveArtifacts artifacts: 'test_results.csv', allowEmptyArchive: true

lava_helper/lava_wait_jobs.py

diff --git a/lava_helper/lava_wait_jobs.py b/lava_helper/lava_wait_jobs.py
index cddc2ed..bdef4af 100755
--- a/lava_helper/lava_wait_jobs.py
+++ b/lava_helper/lava_wait_jobs.py
@@ -161,7 +161,7 @@
         job_links += "Build Config: {}\n".format(info['metadata']['build_name'])
         job_links += "Build link: {}\n".format(info['metadata']['build_job_url'])
         job_links += "LAVA link: {}\n".format(lava_id_to_url(job, user_args))
-        job_links += "TFM LOG: <BUILD_ARTIFACT_URL>{}/target_log.txt\n\n".format(info['job_dir'])
+        job_links += "TFM LOG: {}artifact/{}/target_log.txt\n\n".format(os.getenv("BUILD_URL"), info['job_dir'])
     print(job_links)
 
 def csv_report(jobs):
@@ -211,8 +211,9 @@
     failed_report = "FAILURE_TESTS:"
     for job, info in jobs.items():
         if info['health'] != "Complete" or info['state'] != "Finished":
-            failed_report += " {}:<BUILD_ARTIFACT_URL>{}/target_log.txt\n".format(info['metadata']['build_name'],
-                                                                                  info['job_dir'])
+            failed_report += " {}:{}artifact/{}/target_log.txt\n".format(info['metadata']['build_name'],
+                                                                         os.getenv("BUILD_URL"),
+                                                                         info['job_dir'])
     print(failed_report)
 
 def remove_lava_dupes(results):