commit a3b09059a9a6c515f168fe6473471ff93af6e158
author Paul Sokolovsky <paul.sokolovsky@linaro.org> Sat Dec 25 17:27:29 2021 +0300
committer Joanna Farley <joanna.farley@arm.com> Sun Feb 06 16:51:25 2022 +0100
tree f0d4094711b34252b1e0bee2d65e72fc42e897af
parent 141a76613df9440cb37a988ef0020293965ab538

gen_merge_report.sh: Update builder jobs' artifact paths

To match current state of affairs as present on OpenCI.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I98b13a79de77f7d942173f9d72bcd21797cd6b1e

script/gen_merge_report.sh

diff --git a/script/gen_merge_report.sh b/script/gen_merge_report.sh
index c4f8454..2d8e40b 100644
--- a/script/gen_merge_report.sh
+++ b/script/gen_merge_report.sh
@@ -8,8 +8,8 @@
 REPORT_JSON=$1
 REPORT_HTML=$2
 TEST_DEF_FOLDER="${WORKSPACE}/test-definitions"
-INFO_PATH='artifact/html/lcov_report/coverage.info'
-JSON_PATH='artifact/html/output_file.json'
+INFO_PATH='artifact/trace_report/coverage.info'
+JSON_PATH='artifact/config_file.json'
 BRANCH_FOLDER="scripts/tools/code_coverage/fastmodel_baremetal/bmcov/report/branch_coverage"
 BMCOV_REPORT_FOLDER="$OUTDIR/$TEST_DEF_FOLDER/scripts/tools/code_coverage/fastmodel_baremetal/bmcov/report"
 
@@ -39,17 +39,17 @@
 for index, build_number in enumerate(test_results):
     if "bmcov" in test_files[index] and test_results[build_number] == "SUCCESS":
         merge_number += 1
-        base_url = "{}job/{}/{}/artifact/html".format(
+        base_url = "{}job/{}/{}/artifact".format(
                         server, data['job'], build_number)
         _files.append( {'id': build_number,
                         'config': {
                                     'type': 'http',
-                                    'origin': "{}/output_file.json".format(
+                                    'origin': "{}/config_file.json".format(
                                         base_url)
                                     },
                         'info': {
                                     'type': 'http',
-                                    'origin': "{}/lcov_report/coverage.info".format(
+                                    'origin': "{}/trace_report/coverage.info".format(
                                         base_url)
                                 }
                         })