gen_merge_report.sh: For OpenCI, use "qa-tools" repo
Originally from https://gitlab.arm.com/tooling/qa-tools, scripts there
still need patching to work with OpenCI. So, for now use a fork at
https://review.trustedfirmware.org/ci/qa-tools .
Note that merge.sh from qa-tools doesn't have "-p" option.
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I9ad7cbd1e1a06012e2b35cd59ca0541bfaa591a0
diff --git a/script/gen_merge_report.sh b/script/gen_merge_report.sh
index 68ee2d2..c4f8454 100644
--- a/script/gen_merge_report.sh
+++ b/script/gen_merge_report.sh
@@ -145,8 +145,15 @@
pushd $TEST_DEF_FOLDER
git checkout $TEST_DEFINITIONS_REFSPEC
popd
+
+ if echo "$JENKINS_URL" | grep -q "arm.com"; then
bash $TEST_DEF_FOLDER/scripts/tools/code_coverage/fastmodel_baremetal/bmcov/report/branch_coverage/merge.sh \
-j $MERGE_JSON -l ${OUTDIR} -p $project
+ else
+ bash $TEST_DEF_FOLDER/coverage-tool/coverage-reporting/merge.sh \
+ -j $MERGE_JSON -l ${OUTDIR}
+ fi
+
generate_bmcov_header ${OUTDIR}/index.html ${REPORT_HTML}
cp ${REPORT_HTML} $OUTDIR
popd