From 9407eccc5c8347c7c92d2f25590d8867213107aa Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Fri, 19 Apr 2019 07:09:34 -0400 Subject: Rename classes to avoid duplicates Copy jacoco exec files for upload to sonar Handle ending midnight in time window Issue-ID: OPTFRA-474 Change-Id: Id5df25e404a08e039537e4eb987838835ee12f11 Signed-off-by: Jerry Flood --- .../docker/integration/cmso-optimizer/etc/config/liquibase.properties | 2 +- .../docker/integration/cmso-optimizer/etc/config/optimizer.properties | 2 +- cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cmso-sonar/docker/integration/cmso-optimizer') diff --git a/cmso-sonar/docker/integration/cmso-optimizer/etc/config/liquibase.properties b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/liquibase.properties index fcda8bd..d2f3cb9 100644 --- a/cmso-sonar/docker/integration/cmso-optimizer/etc/config/liquibase.properties +++ b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/liquibase.properties @@ -28,7 +28,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ### -spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:3306/optimizer?createDatabaseIfNotExist=true +spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:${DB_PORT}/optimizer?createDatabaseIfNotExist=true spring.datasource.driver-class-name=org.mariadb.jdbc.Driver spring.datasource.username=root spring.datasource.password=beer diff --git a/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties index babc736..9ff8213 100644 --- a/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties +++ b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties @@ -19,7 +19,7 @@ ### ### MySQL DB. -spring.datasource.url=jdbc:mariadb://${DB_HOST}:3306/optimizer +spring.datasource.url=jdbc:mariadb://${DB_HOST}:${DB_PORT}/optimizer spring.datasource.driver-class-name=org.mariadb.jdbc.Driver spring.datasource.username=root spring.datasource.password=beer diff --git a/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh index 0db6f1f..b8b8d3b 100644 --- a/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh +++ b/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh @@ -7,7 +7,7 @@ unzip org.jacoco.agent-0.8.2.jar cp org.jacoco.agent-0.8.2/jacocoagent.jar . ls -l -VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.optf.cmso.*" +VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/optimizer.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*" echo "VM_ARGS=${VM_ARGS}" -- cgit 1.2.3-korg