summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrabinsk <maciej.grabinski@nokia.com>2019-05-08 13:07:45 +0200
committergrabinsk <maciej.grabinski@nokia.com>2019-05-09 11:28:56 +0200
commita022da6593b7fd675db1132d920832e199427670 (patch)
treebabe031e55c1edc12da4338d9a8db2bbb8fbd6ab
parent06392206779fc39a658c6023605ff7df8c066bfe (diff)
Deferring PRH startup until CBS can serve PRH config data
(cherry picked from commit 98daff81f480b392f66a55d8b725e6aa372fbd3c) Change-Id: Icd4f085fa2f9e252af8147474a72069503973bdc Issue-ID: INT-989 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
-rw-r--r--tests/dcaegen2/prh-testcases/resources/docker-compose.yml25
-rw-r--r--tests/dcaegen2/prh-testcases/resources/prh_library.robot1
2 files changed, 18 insertions, 8 deletions
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
diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
index cfe1d993..10b6cc9e 100644
--- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot
+++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
@@ -16,7 +16,6 @@ Create sessions
Set Suite Variable ${aai_setup_session} aai_setup_session
Create Session consul_setup_session ${CONSUL_SETUP_URL}
Set Suite Variable ${consul_setup_session} consul_setup_session
- Sleep 60s
Reset Simulators
Reset AAI simulator