commit 227f2cc21627d35ff06defff9e95a70c0e11bf98
author Paul Sokolovsky <paul.sokolovsky@linaro.org> Tue Dec 21 10:58:26 2021 +0300
committer Zelalem Aweke <zelalem.aweke@arm.com> Sat Jan 22 00:44:06 2022 +0100
tree 89a7c8b0d1040c81ec7106c58691839976aa5f21
parent 5aa8fc72177e6a0b4580d709cc5bf3b57fa878cb

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

script/gen_merge_report.sh

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

script/test_definitions.sh

diff --git a/script/test_definitions.sh b/script/test_definitions.sh
index 0529ea7..9ea8ad1 100644
--- a/script/test_definitions.sh
+++ b/script/test_definitions.sh
@@ -4,6 +4,15 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
+if echo "$JENKINS_URL" | grep -q "arm.com"; then
+
 export GERRIT_URL=${GERRIT_URL:-https://gerrit.oss.arm.com}
 export TEST_DEFINITIONS_REPO=${TEST_DEFINITIONS_REPO:-${GERRIT_URL}/tests/lava/test-definitions.git}
 export TEST_DEFINITIONS_REFSPEC=${TEST_DEFINITIONS_REFSPEC:-tools-coverage-workflow_2020-10-06}
+
+else
+
+export TEST_DEFINITIONS_REPO=${TEST_DEFINITIONS_REPO:-https://review.trustedfirmware.org/ci/qa-tools}
+export TEST_DEFINITIONS_REFSPEC=${TEST_DEFINITIONS_REFSPEC:-openci}
+
+fi