Revert "gen_merge_report.sh: Update builder jobs' artifact paths"
This reverts commit a3b09059a9a6c515f168fe6473471ff93af6e158.
Reason for revert: It seems that after all we do have inconsistency between ArmCI and OpenCI in artifact paths, at least ArmCI codecov support is reported to be broken. Revert this patch to confirm it's the culprit.
Change-Id: I7f8ed93f7d57faf37ddabc5f6951e4b1f7d3e362
diff --git a/script/gen_merge_report.sh b/script/gen_merge_report.sh
index 2fbc6a8..cc53d3e 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/trace_report/coverage.info'
-JSON_PATH='artifact/config_file.json'
+INFO_PATH='artifact/html/lcov_report/coverage.info'
+JSON_PATH='artifact/html/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,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".format(
+ base_url = "{}job/{}/{}/artifact/html".format(
server, data['job'], build_number)
_files.append( {'id': build_number,
'config': {
'type': 'http',
- 'origin': "{}/config_file.json".format(
+ 'origin': "{}/output_file.json".format(
base_url)
},
'info': {
'type': 'http',
- 'origin': "{}/trace_report/coverage.info".format(
+ 'origin': "{}/lcov_report/coverage.info".format(
base_url)
}
})