diff options
| author |   vrvarma <vikas.varma@att.com> | 2020-03-25 00:47:00 -0400 |
|---|---|---|
| committer | vrvarma <vikas.varma@att.com> | 2020-03-26 00:44:57 -0400 |
| commit | 5debbd92e089afe66915ecd42f80216dfa7c8f5f (patch) | |
| tree | 728285a3393406d4bb6bed339f9b888d114f6803 /cmso-topology | |
| parent | ca83b540eea5b5c87647d93020e6d2f733455100 (diff) | |
Fix optf-cmso clm and sonar reports
Change-Id: I9a818d717667290c8794ed055191fc24adedb68b
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-694
Diffstat (limited to 'cmso-topology')
| -rw-r--r-- | cmso-topology/pom.xml | 5 | ||||
| -rw-r--r-- | cmso-topology/src/main/docker/Dockerfile | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml index 6ffc597..ba39fa3 100644 --- a/cmso-topology/pom.xml +++ b/cmso-topology/pom.xml @@ -47,8 +47,6 @@ <jacoco.itPath>${basedir}/target/jacoco_itReport</jacoco.itPath> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> - <sonar.jacoco.reportPath>${basedir}/target/jacoco-ut.exec</sonar.jacoco.reportPath> - <sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath> <sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath> <sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath> @@ -56,6 +54,9 @@ <docker.skip.push>false</docker.skip.push> <docker.skip.tag>false</docker.skip.tag> <skip.staging.artifacts>false</skip.staging.artifacts> + <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/topology-it/jacoco.xml,${project.build.directory}/site/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> + + </properties> diff --git a/cmso-topology/src/main/docker/Dockerfile b/cmso-topology/src/main/docker/Dockerfile index 015a794..f0ffc94 100644 --- a/cmso-topology/src/main/docker/Dockerfile +++ b/cmso-topology/src/main/docker/Dockerfile @@ -15,7 +15,7 @@ RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /et apt-get update && \ apt-get -y dist-upgrade && \ apt-get install -y openjdk-11-jre-headless && \ - apt-get install -y curl + apt-get install -y curl unzip wget netcat RUN groupadd onap \ && useradd -m -g onap onap |