commit dd04dea90024e27ea1025d1bcc1a2bb959ab2d95
author Paul Sokolovsky <paul.sokolovsky@linaro.org> Mon Feb 21 13:40:43 2022 +0300
committer Paul Sokolovsky <paul.sokolovsky@linaro.org> Mon Feb 21 15:15:11 2022 +0300
tree 8b900672a2bcdfbd6aea484740d3ea55fd0898cd
parent bd0c22a27f4a90b3cba9bfe5278d9625c20ebbee

gen_merge_report.sh: Actually use INFO_PATH/JSON_PATH settings

These config vars existed, but weren't actually used in the script. Use
them, with related refactors (like factoring out common artifact path
to another config var, ARTIFACT_PATH).

These changes are in preparation of supporting ArmCI vs OpenCI code
coverage related artifact path differences.

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

script/gen_merge_report.sh

diff --git a/script/gen_merge_report.sh b/script/gen_merge_report.sh
index cc53d3e..392c67f 100644
--- a/script/gen_merge_report.sh
+++ b/script/gen_merge_report.sh
@@ -8,8 +8,9 @@
 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'
+ARTIFACT_PATH='artifact/html'
+INFO_PATH='lcov_report/coverage.info'
+JSON_PATH='output_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,18 +40,18 @@
 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(
-                        server, data['job'], build_number)
+        base_url = "{}job/{}/{}/{}".format(
+                        server, data['job'], build_number, "$ARTIFACT_PATH")
         _files.append( {'id': build_number,
                         'config': {
                                     'type': 'http',
-                                    'origin': "{}/output_file.json".format(
-                                        base_url)
+                                    'origin': "{}/{}".format(
+                                        base_url, "$JSON_PATH")
                                     },
                         'info': {
                                     'type': 'http',
-                                    'origin': "{}/lcov_report/coverage.info".format(
-                                        base_url)
+                                    'origin': "{}/{}".format(
+                                        base_url, "$INFO_PATH")
                                 }
                         })
 merge_json = { 'files' : _files }