diff options
Diffstat (limited to 'cmso-sonar/docker')
7 files changed, 22 insertions, 18 deletions
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}" diff --git a/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties index 3602577..ff3dab5 100644 --- a/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties +++ b/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties @@ -1,7 +1,7 @@ #------------------------------------------------------------------------------- -# Copyright 2017-2018 AT&T Intellectual Property. -# Modifications Copyright 2018 IBM. +# Copyright ? 2017-2018 AT&T Intellectual Property. +# Modifications Copyright ? 2018 IBM. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ # # # Unless otherwise specified, all documentation contained herein is licensed -# under the Creative Commons License, Attribution 4.0 Intl. (the ??License?); +# under the Creative Commons License, Attribution 4.0 Intl. (the ???License???); # you may not use this documentation except in compliance with the License. # You may obtain a copy of the License at # @@ -32,7 +32,7 @@ ### ### MySQL DB. -spring.datasource.url=jdbc:mariadb://${DB_HOST}:3306/cmso +spring.datasource.url=jdbc:mariadb://${DB_HOST}:${DB_PORT}/cmso 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-service/etc/config/liquibase.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties index b8c850e..05baa58 100644 --- a/cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties +++ b/cmso-sonar/docker/integration/cmso-service/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/cmso?createDatabaseIfNotExist=true +spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:${DB_PORT}/cmso?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/docker-compose.yml b/cmso-sonar/docker/integration/docker-compose.yml index 5c2f173..e0c81f9 100644 --- a/cmso-sonar/docker/integration/docker-compose.yml +++ b/cmso-sonar/docker/integration/docker-compose.yml @@ -5,7 +5,7 @@ services: image: mariadb:10.1.11 volumes: - "/var/lib/mysql" - - "../mariadb/conf1:/etc/mysql/conf.d:ro" + - "./mariadb/conf1:/etc/mysql/conf.d:ro" environment: - MYSQL_ROOT_PASSWORD=beer ports: @@ -20,6 +20,7 @@ services: - mariadb environment: - DB_HOST=mariadb + - DB_PORT=3306 entrypoint: "bash -x /share/etc/startDbinitService.sh" db-init-opt: @@ -31,6 +32,7 @@ services: - mariadb environment: - DB_HOST=mariadb + - DB_PORT=3306 entrypoint: "bash -x /share/etc/startDbinitService.sh" @@ -47,6 +49,7 @@ services: - "8080:8080" environment: - DB_HOST=mariadb + - DB_PORT=3306 - OPTIMIZER_URL=http://cmso-optimizer:7997/optimizer/v1/optimize/schedule - OPTIMIZER_HEALTH_URL=http://cmso-optimizer:7997/optimizer/v1/health?checkInterfaces=true @@ -83,6 +86,7 @@ services: - "7997:7997" environment: - DB_HOST=mariadb + - DB_PORT=3306 - TOPOLOGY_HOST=cmso-topology - TICKETMGT_HOST=cmso-ticketmgt @@ -96,7 +100,7 @@ services: environment: - GLOBAL_SCHEDULER_URL=http://cmso-service:8080 - GLOBAL_OPTIMIZER_URL=http://cmso-optimizer:7997 - - CMSO_STARTUP_WAIT_TIME=600s + - CMSO_STARTUP_WAIT_TIME=20m - TAGS=-i ete - OUTPUT=-d /share working_dir: /opt/cmso-robot diff --git a/cmso-sonar/docker/integration/ete_test.sh b/cmso-sonar/docker/integration/ete_test.sh index 0d86fef..5c38fa2 100755 --- a/cmso-sonar/docker/integration/ete_test.sh +++ b/cmso-sonar/docker/integration/ete_test.sh @@ -3,28 +3,28 @@ docker-compose up >up.txt 2>&1 & ### Wait for robot to finish sleep 240 -docker exec cmso-service_cmso-robot_1 ls +docker exec integration_cmso-robot_1 ls while [ $? -ne 1 ]; do sleep 60 - docker exec cmso-service_cmso-robot_1 ls + docker exec integration_cmso-robot_1 ls done ### Shut down java with to give time to write the jacoco_exec file -docker exec cmso-service_cmso-service_1 pkill java -docker exec cmso-service_cmso-optimizer_1 pkill java +docker exec integration_cmso-service_1 pkill java +docker exec integration_cmso-optimizer_1 pkill java sleep 10 ### wait for cmso containers to exit and jacoco files written -docker exec cmso-service_cmso-service_1 ls +docker exec integration_cmso-service_1 ls while [ $? -ne 1 ]; do sleep 60 - docker exec cmso-service_cmso-service_1 ls + docker exec integration_cmso-service_1 ls done -docker exec cmso-service_cmso-optimizer_1 ls +docker exec integration_cmso-optimizer_1 ls while [ $? -ne 1 ]; do sleep 60 - docker exec cmso-service_cmso-optimizer_1 ls + docker exec integration_cmso-optimizer_1 ls done cat up.txt |