tf-ci-gateway/generate_report.sh: Enable gen_merge_report.sh unconditionally
Now that gen_merge_report.sh is known to work on OpenCI too.
This patch also enabled shell tracing to help with monitoring merged report
generation.
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: Ibc423d35947ff1133225ead425f919f09a68259f
diff --git a/job/tf-ci-gateway/generate_report.sh b/job/tf-ci-gateway/generate_report.sh
index 5c958e8..485ba1f 100755
--- a/job/tf-ci-gateway/generate_report.sh
+++ b/job/tf-ci-gateway/generate_report.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set -e
+set -ex
# Generate test report
if [ "$CI_ROOT" ]; then
@@ -37,11 +37,6 @@
--meta-data html:coverity.data \
|| true
- # TODO: Open CI does not (yet) support the merge of code coverage report into main
- # report, so for the moment condition this task under the Jenkins Arm
- # environment.
- if echo "$JENKINS_URL" | grep -q "arm.com"; then
- source $CI_ROOT/script/gen_merge_report.sh "${WORKSPACE}/report.json" \
- "${WORKSPACE}/report.html"
- fi
+ source $CI_ROOT/script/gen_merge_report.sh "${WORKSPACE}/report.json" \
+ "${WORKSPACE}/report.html"
fi