From bc1d800f3ddce555de9c17518ef7e74126fb028f Mon Sep 17 00:00:00 2001 From: eh552t Date: Wed, 4 Jul 2018 14:43:49 +0200 Subject: Fix https issue + create session globally Change-Id: I94ef9a15a04f969ae036794f99d44c9d3d57564a Signed-off-by: eh552t Issue-ID: CLAMP-194 --- test/csit/scripts/clamp/start_clamp_containers.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test/csit/scripts/clamp/start_clamp_containers.sh') diff --git a/test/csit/scripts/clamp/start_clamp_containers.sh b/test/csit/scripts/clamp/start_clamp_containers.sh index 11ddda1e4..dc0b4fe41 100755 --- a/test/csit/scripts/clamp/start_clamp_containers.sh +++ b/test/csit/scripts/clamp/start_clamp_containers.sh @@ -28,11 +28,11 @@ echo "This is ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh" docker-compose up -d # WAIT 5 minutes maximum and test every 5 seconds if Clamp up using HealthCheck API -TIME_OUT=1200 +TIME_OUT=600 INTERVAL=5 TIME=0 while [ "$TIME" -lt "$TIME_OUT" ]; do - response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/restservices/clds/v1/clds/healthcheck); echo $response + response=$(curl --write-out '%{http_code}' --silent --output /dev/null -vk --key config/org.onap.clamp.keyfile https://localhost:8443/restservices/clds/v1/clds/healthcheck); echo $response if [ "$response" == "200" ]; then echo Clamp and its database well started in $TIME seconds @@ -46,12 +46,13 @@ done if [ "$TIME" -ge "$TIME_OUT" ]; then echo TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests... + exit 1; fi # To avoid some problem because templates not yet read TIME=0 while [ "$TIME" -lt "$TIME_OUT" ]; do - response=$(curl --write-out '%{http_code}' --silent --output /dev/null -u admin:password http://localhost:8080/restservices/clds/v1/cldsTempate/template-names); echo $response + response=$(curl --write-out '%{http_code}' --silent --output /dev/null -u admin:password -vk --key config/org.onap.clamp.keyfile https://localhost:8443/restservices/clds/v1/cldsTempate/template-names); echo $response if [ "$response" == "200" ]; then echo Templates well available @@ -65,4 +66,5 @@ done if [ "$TIME" -ge "$TIME_OUT" ]; then echo TIME OUT: Templates not available in $TIME_OUT seconds... Could cause problems for tests... + exit 1; fi -- cgit 1.2.3-korg