diff options
| author |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-09-06 08:20:03 +0200 |
|---|---|---|
| committer | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-09-06 09:41:53 +0200 |
| commit | b20f963b6bafa0a0a5acfac3f2c802e5539b5068 (patch) | |
| tree | 954636589ce62f9351aa50a082ce1e560908ad81 /hv-collector-coverage | |
| parent | d6f5bfa934b9aa0571e853fc5432ab84eceb9db1 (diff) | |
Build enhancements
* Handling docker proxy configuration in a reasonable way
* Should skip coverage verification when skipTests was set
* Get rid of resources encoding warning
* Fix check-coverage output on Jenkins
Change-Id: If828fc41a88074931649e739c615a8b9d8db8739
Issue-ID: DCAEGEN2-755
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Diffstat (limited to 'hv-collector-coverage')
| -rwxr-xr-x | hv-collector-coverage/check-coverage.sh | 15 | ||||
| -rw-r--r-- | hv-collector-coverage/pom.xml | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/hv-collector-coverage/check-coverage.sh b/hv-collector-coverage/check-coverage.sh index 7a2f4c6c..956891ac 100755 --- a/hv-collector-coverage/check-coverage.sh +++ b/hv-collector-coverage/check-coverage.sh @@ -3,20 +3,27 @@ set -euo pipefail JACOCO_REPORT="$1" MIN_COVERAGE_PERCENT="$2" +LOG_FILE=target/check-coverage.log function coverage_from_report() { local xpath_expr="string(/report/counter[@type='INSTRUCTION']/@$1)" - xpath -q -e "$xpath_expr" "$JACOCO_REPORT" + xpath -q -e "$xpath_expr" "$JACOCO_REPORT" 2>> ${LOG_FILE} } -missed=`coverage_from_report missed` -covered=`coverage_from_report covered` +missed=$(coverage_from_report missed) +covered=$(coverage_from_report covered) total=$(($missed + $covered)) coverage=$((100 * $covered / $total)) +if [[ $(wc -c < ${LOG_FILE}) > 0 ]]; then + echo "Warnings from xpath evaluation:" + cat ${LOG_FILE} + echo +fi + echo "Coverage: $coverage% (covered/total: $covered/$total)" -if [[ $coverage -lt $MIN_COVERAGE_PERCENT ]]; then +if [[ ${coverage} -lt ${MIN_COVERAGE_PERCENT} ]]; then echo "Coverage is too low. Minimum coverage: $MIN_COVERAGE_PERCENT%" exit 1 fi diff --git a/hv-collector-coverage/pom.xml b/hv-collector-coverage/pom.xml index 970d4b41..31450918 100644 --- a/hv-collector-coverage/pom.xml +++ b/hv-collector-coverage/pom.xml @@ -60,7 +60,7 @@ </goals> <configuration> <excludes> - <!-- Exclute Protobuf-generated classes --> + <!-- Exclude Protobuf-generated classes --> <exclude>org/onap/ves/*</exclude> </excludes> <dataFileIncludes> @@ -84,6 +84,7 @@ </execution> </executions> <configuration> + <skip>${skipTests}</skip> <executable>${project.basedir}/check-coverage.sh</executable> <workingDirectory>${project.basedir}</workingDirectory> <arguments> |