From 98daff81f480b392f66a55d8b725e6aa372fbd3c Mon Sep 17 00:00:00 2001 From: grabinsk Date: Wed, 8 May 2019 13:07:45 +0200 Subject: Deferring PRH startup until CBS can serve PRH config data (This needs to be replaced by optimizing CBS access retries in PRH service itself) Change-Id: Icd4f085fa2f9e252af8147474a72069503973bdc Issue-ID: INT-989 Signed-off-by: grabinsk --- .../prh-testcases/resources/docker-compose.yml | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'tests/dcaegen2/prh-testcases/resources/docker-compose.yml') diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index fdb1c50e..992534fb 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "2.2" services: prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest @@ -10,9 +10,12 @@ services: - PRH_LOG_LEVEL container_name: prh depends_on: - - cbs - - dmaap-mr - - aai + cbs: + condition: service_healthy + dmaap-mr: + condition: service_started + aai: + condition: service_started ssl_prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest @@ -29,9 +32,12 @@ services: - CONFIG_BINDING_SERVICE container_name: ssl_prh depends_on: - - cbs - - dmaap-mr - - aai + cbs: + condition: service_healthy + dmaap-mr: + condition: service_started + aai: + condition: service_started dmaap-mr: build: @@ -158,6 +164,11 @@ services: - CONSUL_HOST depends_on: - consul-cfg + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:10000/service_component_all/dcae-prh"] + interval: 3s + timeout: 2s + retries: 20 container_name: cbs -- cgit 1.2.3-korg