summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hv-collector-analysis/pom.xml57
-rwxr-xr-xhv-collector-coverage/check-coverage.sh15
-rw-r--r--hv-collector-coverage/pom.xml3
-rw-r--r--pom.xml21
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=========================================================
-->
<project xmlns="http://maven.apache.org/POM/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">
- <modelVersion>4.0.0</modelVersion>
+ 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">
+ <modelVersion>4.0.0</modelVersion>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
- <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
- <artifactId>hv-collector-analysis</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <description>VES HighVolume Collector :: Code analysis configuration</description>
+ <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
+ <artifactId>hv-collector-analysis</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>VES HighVolume Collector :: Code analysis configuration</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project> \ 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 @@
</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>
diff --git a/pom.xml b/pom.xml
index e1c90b3b..ebb3afc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -363,6 +363,20 @@
<profiles>
<profile>
+ <id>docker-proxy</id>
+ <activation>
+ <property>
+ <name>docker.http_proxy</name>
+ </property>
+ </activation>
+ <properties>
+ <!-- set build args as defined in https://dmp.fabric8.io/#build-buildargs -->
+ <docker.buildArg.http_proxy>${docker.http_proxy}</docker.buildArg.http_proxy>
+ <docker.buildArg.https_proxy>${docker.http_proxy}</docker.buildArg.https_proxy>
+ </properties>
+ </profile>
+
+ <profile>
<id>docker</id>
<activation>
<property>
@@ -439,13 +453,6 @@
</name>
<registry>${docker-image.registry}</registry>
<build>
- <!--
- <args>
- <http_proxy>${docker.http_proxy}</http_proxy>
- <https_proxy>${docker.http_proxy}</https_proxy>
- </args>
- -->
-
<dockerFileDir>${project.basedir}</dockerFileDir>
<tags>
<tag>${project.version}-${maven.build.timestamp}Z</tag>