diff options
author | Jerry Flood <jflood@att.com> | 2019-04-19 07:09:34 -0400 |
---|---|---|
committer | Jerry Flood <jflood@att.com> | 2019-04-19 10:07:39 -0400 |
commit | 9407eccc5c8347c7c92d2f25590d8867213107aa (patch) | |
tree | cf97b388f99b64bac36e60ac95147fd933380116 /cmso-sonar/docker/integration/docker-compose.yml | |
parent | ee1816bf02d5f76548b78c46c39537ec8c1d23b0 (diff) |
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 <jflood@att.com>
Diffstat (limited to 'cmso-sonar/docker/integration/docker-compose.yml')
-rw-r--r-- | cmso-sonar/docker/integration/docker-compose.yml | 8 |
1 files changed, 6 insertions, 2 deletions
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 |