Fix optf-cmso clm and sonar reports

Change-Id: I9a818d717667290c8794ed055191fc24adedb68b
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-694

6 files changed, 60 insertions, 18 deletions

diff --git a/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh
index b4be6b1..bd484c3 100755
--- a/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh
@@ -2,9 +2,9 @@
 apt update
 apt install wget
 apt install unzip  --assume-yes
-wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
+wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.5/org.jacoco.agent-0.8.5.jar
+unzip org.jacoco.agent-0.8.5.jar
+cp org.jacoco.agent-0.8.5/jacocoagent.jar .
 ls -l
 
 VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/optimizer.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
diff --git a/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh
index f049e5c..6bd100f 100755
--- a/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh
@@ -2,9 +2,9 @@
 apt update
 apt install wget
 apt install unzip  --assume-yes
-wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
+wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.5/org.jacoco.agent-0.8.5.jar
+unzip org.jacoco.agent-0.8.5.jar
+cp org.jacoco.agent-0.8.5/jacocoagent.jar .
 ls -l
 
 VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/service.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
diff --git a/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
index 1331bcf..a7de3ec 100755
--- a/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
@@ -2,9 +2,9 @@
 apt update
 apt install wget
 apt install unzip  --assume-yes
-wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
+wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.5/org.jacoco.agent-0.8.5.jar
+unzip org.jacoco.agent-0.8.5.jar
+cp org.jacoco.agent-0.8.5/jacocoagent.jar .
 ls -l
 
 VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/ticketmgt.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
diff --git a/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
index 8c7df11..78fac60 100755
--- a/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
@@ -2,9 +2,9 @@
 apt update
 apt install wget
 apt install unzip  --assume-yes
-wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
+wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.5/org.jacoco.agent-0.8.5.jar
+unzip org.jacoco.agent-0.8.5.jar
+cp org.jacoco.agent-0.8.5/jacocoagent.jar .
 ls -l
 
 VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/topology.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index 7bcd0a9..beb0655 100644
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -102,7 +102,7 @@
 				<artifactId>jacoco-maven-plugin</artifactId>

 				<executions>

 					<execution>

-						<id>post-integration-test1</id>

+						<id>post-integration-test</id>

 						<phase>post-integration-test</phase>

 						<goals>

 							<goal>report</goal>

@@ -110,7 +110,7 @@
 						<configuration>

 							<skip>${skipIntegrationTests}</skip>

 							<dataFile>${project.basedir}/target/code-coverage/service.jacoco.exec</dataFile>

-							<outputDirectory>${project.basedir}/target/site/service-it</outputDirectory>

+							<outputDirectory>${project.basedir}/../cmso-service/target/site/service-it</outputDirectory>

 							<includes>

 								<include>service/**</include>

 							</includes>

@@ -123,7 +123,7 @@
 						</configuration>

 					</execution>

 					<execution>

-						<id>post-integration-test2</id>

+						<id>post-integration-optimizer</id>

 						<phase>post-integration-test</phase>

 						<goals>

 							<goal>report</goal>

@@ -131,7 +131,7 @@
 						<configuration>

 							<skip>${skipIntegrationTests}</skip>

 							<dataFile>${project.basedir}/target/code-coverage/optimizer.jacoco.exec</dataFile>

-							<outputDirectory>${project.basedir}/target/site/optimizer-it</outputDirectory>

+							<outputDirectory>${project.basedir}/../cmso-optimizer/target/site/optimizer-it</outputDirectory>

 							<includes>

 								<include>optimizer/**</include>

 							</includes>

@@ -143,6 +143,48 @@
 							</excludes>

 						</configuration>

 					</execution>

+					<execution>

+						<id>post-integration-topology</id>

+						<phase>post-integration-test</phase>

+						<goals>

+							<goal>report</goal>

+						</goals>

+						<configuration>

+							<skip>${skipIntegrationTests}</skip>

+							<dataFile>${project.basedir}/target/code-coverage/topology.jacoco.exec</dataFile>

+							<outputDirectory>${project.basedir}/../cmso-topology/target/site/topology-it</outputDirectory>

+							<includes>

+								<include>topology/**</include>

+							</includes>

+							<excludes>

+								<exclude>**/gen/**</exclude>

+								<exclude>**/generated-sources/**</exclude>

+								<exclude>**/yang-gen/**</exclude>

+								<exclude>**/pax/**</exclude>

+							</excludes>

+						</configuration>

+					</execution>

+					<execution>

+						<id>post-integration-ticketmgt</id>

+						<phase>post-integration-test</phase>

+						<goals>

+							<goal>report</goal>

+						</goals>

+						<configuration>

+							<skip>${skipIntegrationTests}</skip>

+							<dataFile>${project.basedir}/target/code-coverage/ticketmgt.jacoco.exec</dataFile>

+							<outputDirectory>${project.basedir}/../cmso-ticketmgt/target/site/ticketmgt-it</outputDirectory>

+							<includes>

+								<include>ticketmgt/**</include>

+							</includes>

+							<excludes>

+								<exclude>**/gen/**</exclude>

+								<exclude>**/generated-sources/**</exclude>

+								<exclude>**/yang-gen/**</exclude>

+								<exclude>**/pax/**</exclude>

+							</excludes>

+						</configuration>

+					</execution>

 				</executions>

 			</plugin>

 		</plugins>

diff --git a/cmso-sonar/src/test/resources/integration.properties b/cmso-sonar/src/test/resources/integration.properties
index 4e0e21b..f3052c3 100644
--- a/cmso-sonar/src/test/resources/integration.properties
+++ b/cmso-sonar/src/test/resources/integration.properties
@@ -1,7 +1,7 @@
 base.path=./
 jacoco.exec.dest=target/code-coverage
 jacoco.exec.classes=target/classes
-source.classes.folders=service|../cmso-service/target/classes,optimizer|../cmso-optimizer/target/classes
-jacoco.exec.source.files=docker/integration/cmso-service/logs/service.jacoco.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec
+source.classes.folders=service|../cmso-service/target/classes,optimizer|../cmso-optimizer/target/classes,topology|../cmso-topology/target/classes,ticketmgt|../cmso-ticketmgt/target/classes
+jacoco.exec.source.files=docker/integration/cmso-service/logs/service.jacoco.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec,docker/integration/cmso-topology/logs/topology.jacoco.exec,docker/integration/cmso-ticketmgt/logs/ticketmgt.jacoco.exec
 
 copy.jacoco.for.sonar=docker/integration/cmso-service/logs/service.jacoco.exec|../cmso-service/target/jacoco-it.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec|../cmso-optimizer/target/jacoco-it.exec,docker/integration/cmso-topology/logs/topology.jacoco.exec|../cmso-topology/target/jacoco-it.exec,docker/integration/cmso-ticketmgt/logs/ticketmgt.jacoco.exec|../cmso-ticketmgt/target/jacoco-it.exec
\ No newline at end of file