diff options
| -rwxr-xr-x | plans/multicloud-k8s/functionality1/setup.sh | 3 | ||||
| -rw-r--r-- | tests/dcaegen2/prh-testcases/resources/docker-compose.yml | 25 | ||||
| -rw-r--r-- | tests/dcaegen2/prh-testcases/resources/prh_library.robot | 1 |
3 files changed, 20 insertions, 9 deletions
diff --git a/plans/multicloud-k8s/functionality1/setup.sh b/plans/multicloud-k8s/functionality1/setup.sh index eda24ba4..006a114d 100755 --- a/plans/multicloud-k8s/functionality1/setup.sh +++ b/plans/multicloud-k8s/functionality1/setup.sh @@ -19,11 +19,13 @@ MONGO_IP=$(./get-instance-ip.sh multicloud-k8s-mongodb) # setup multicloud-k8s configuration CONFIG_FILE=$(pwd)/k8sconfig.json +SERVICE_PORT=9015 cat << EOF > $CONFIG_FILE { "database-address": "$MONGO_IP", "database-type": "mongo", "plugin-dir": "plugins", + "service-port": "$SERVICE_PORT", "kube-config-dir": "kubeconfigs" } EOF @@ -34,7 +36,6 @@ cat $CONFIG_FILE docker run --name multicloud-k8s -v $CONFIG_FILE:/opt/multicloud/k8splugin/k8sconfig.json \ -d nexus3.onap.org:10001/onap/multicloud/k8s:latest SERVICE_IP=$(./get-instance-ip.sh multicloud-k8s) -SERVICE_PORT=8081 popd if [[ $no_proxy && $no_proxy != *$SERVICE_IP* ]]; then 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 0727169d..663f2ea7 100644 --- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot +++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot @@ -106,7 +106,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 120s Reset Simulators Reset AAI simulator |