From b20f963b6bafa0a0a5acfac3f2c802e5539b5068 Mon Sep 17 00:00:00 2001 From: Piotr Jaszczyk Date: Thu, 6 Sep 2018 08:20:03 +0200 Subject: 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 --- hv-collector-analysis/pom.xml | 57 +++++++++++++++++++-------------- hv-collector-coverage/check-coverage.sh | 15 ++++++--- hv-collector-coverage/pom.xml | 3 +- pom.xml | 21 ++++++++---- 4 files changed, 60 insertions(+), 36 deletions(-) diff --git a/hv-collector-analysis/pom.xml b/hv-collector-analysis/pom.xml index a4d0a738..e9ffcf36 100644 --- a/hv-collector-analysis/pom.xml +++ b/hv-collector-analysis/pom.xml @@ -19,32 +19,41 @@ ~ ============LICENSE_END========================================================= --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + - org.onap.dcaegen2.collectors.hv-ves - hv-collector-analysis - 1.0.0-SNAPSHOT - VES HighVolume Collector :: Code analysis configuration + org.onap.dcaegen2.collectors.hv-ves + hv-collector-analysis + 1.0.0-SNAPSHOT + VES HighVolume Collector :: Code analysis configuration - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + UTF-8 + + + + \ No newline at end of file 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 @@ - + org/onap/ves/* @@ -84,6 +84,7 @@ + ${skipTests} ${project.basedir}/check-coverage.sh ${project.basedir} diff --git a/pom.xml b/pom.xml index e1c90b3b..ebb3afc4 100644 --- a/pom.xml +++ b/pom.xml @@ -362,6 +362,20 @@ + + docker-proxy + + + docker.http_proxy + + + + + ${docker.http_proxy} + ${docker.http_proxy} + + + docker @@ -439,13 +453,6 @@ ${docker-image.registry} - - ${project.basedir} ${project.version}-${maven.build.timestamp}Z -- cgit 1.2.3-korg