From d0eaecacec822c0332a31f499f9d972c9b39e691 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Thu, 19 Jul 2018 17:54:15 +0300 Subject: fix docker_run script Change-Id: I4151bb342c9330990271ed9eb7e96d19e8e4c165 Issue-ID: SDC-1543 Signed-off-by: Yuli Shlosberg --- sdc-os-chef/scripts/docker_run.sh | 6 +- sdc-os-chef/scripts/sanity_run.sh | 187 -------------------------------------- 2 files changed, 4 insertions(+), 189 deletions(-) delete mode 100644 sdc-os-chef/scripts/sanity_run.sh diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index 7f9cde76bd..a5688579f2 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -504,7 +504,8 @@ function dcae-fe { # apis-sanity function sdc-api-tests { if [[ ${RUN_API_TESTS} = true ]] ; then - healthCheck_http_code=healthCheck + healthCheck + healthCheck_http_code=$? if [[ ${healthCheck_http_code} == 200 ]] ; then echo "docker run sdc-api-tests..." echo "Trigger sdc-api-tests docker, please wait..." @@ -525,7 +526,8 @@ function sdc-api-tests { function sdc-ui-tests { if [[ ${RUN_UI_TESTS} = true ]] ; then - healthCheck_http_code=healthCheck + healthCheck + healthCheck_http_code=$? if [[ ${healthCheck_http_code} == 200 ]]; then echo "docker run sdc-ui-tets..." echo "Trigger sdc-ui-tests docker, please wait..." diff --git a/sdc-os-chef/scripts/sanity_run.sh b/sdc-os-chef/scripts/sanity_run.sh deleted file mode 100644 index 8898b92a81..0000000000 --- a/sdc-os-chef/scripts/sanity_run.sh +++ /dev/null @@ -1,187 +0,0 @@ -#!/bin/bash - -#Define this as variable, so it can be excluded in run commands on Docker for OSX, as /etc/localtime cant be mounted there. -LOCAL_TIME_MOUNT_CMD="--volume /etc/localtime:/etc/localtime:ro" -# If os is OSX, unset this, so /etc/localtime is not mounted, otherwise leave it be -if [[ "$OSTYPE" == "darwin"* ]]; then - LOCAL_TIME_MOUNT_CMD="" -fi - -function usage { - echo "usage: sanity_run.sh [ -r|--release ] [ -e|--environment ] [ -p|--port ] [ -l|--local ] [ -t|--runTests ] [ -h|--help ]" -} - -function cleanup { - echo "performing old dockers cleanup" - docker_ids=`docker ps -a | egrep -v "onap/sdc-simulator" | egrep "ecomp-nexus:${PORT}/sdc|sdc-sanity|Exit" | awk '{print $1}'` - for X in ${docker_ids} - do - docker rm -f ${X} - done -} - - -function dir_perms { - mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE - mkdir -p ${WORKSPACE}/data/logs/FE/SDC/SDC-FE - chmod -R 777 ${WORKSPACE}/data/logs -} - -function monitor_docker { - - echo monitor $1 Docker - sleep 5 - TIME_OUT=900 - INTERVAL=20 - TIME=0 - while [ "$TIME" -lt "$TIME_OUT" ]; do - - MATCH=`docker logs --tail 30 $1 | grep "DOCKER STARTED"` - echo MATCH is -- $MATCH - - if [ -n "$MATCH" ]; then - echo DOCKER start finished in $TIME seconds - break - fi - - echo Sleep: $INTERVAL seconds before testing if $1 DOCKER is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds - sleep $INTERVAL - TIME=$(($TIME+$INTERVAL)) - done - - if [ "$TIME" -ge "$TIME_OUT" ]; then - echo -e "\e[1;31mTIME OUT: DOCKER was NOT fully started in $TIME_OUT seconds... Could cause problems ...\e[0m" - fi - -} - -function healthCheck { - curl localhost:9200/_cluster/health?pretty=true - - echo "BE health-Check:" - curl http://localhost:8080/sdc2/rest/healthCheck - - echo "" - echo "" - echo "FE health-Check:" - curl http://localhost:8181/sdc1/rest/healthCheck - - - echo "" - echo "" - healthCheck_http_code=$(curl -o /dev/null -w '%{http_code}' -H "Accept: application/json" -H "Content-Type: application/json" -H "USER_ID: jh0003" http://localhost:8080/sdc2/rest/v1/user/demo;) - if [[ ${healthCheck_http_code} != 200 ]] - then - echo "Error [${healthCheck_http_code}] while user existance check" - return ${healthCheck_http_code} - fi - echo "check user existance: OK" - return ${healthCheck_http_code} -} - -function elasticHealthCheck { - echo "Elastic Health-Check:" - - COUNTER=0 - while [ $COUNTER -lt 20 ]; do - echo "Waiting ES docker to start" - health_Check_http_code=$(curl -o /dev/null -w '%{http_code}' http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=120s) - if [[ "$health_Check_http_code" -eq 200 ]] - then - break - fi - let COUNTER=COUNTER+1 - sleep 4 - done - - healthCheck_http_code=$(curl -o /dev/null -w '%{http_code}' http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=120s) - if [[ "$health_Check_http_code" != 200 ]] - then - echo "Error [${healthCheck_http_code}] ES NOT started correctly" - exit ${healthCheck_http_code} - fi - echo "ES started correctly" - curl localhost:9200/_cluster/health?pretty=true - return ${healthCheck_http_code} -} - -RELEASE=latest -LOCAL=false -RUNTESTS=true -DEBUG_PORT="--publish 4000:4000" - -while [ $# -gt 0 ]; do - case $1 in - # -r | --release - The specific docker version to pull and deploy - -r | --release ) - shift 1 ; - RELEASE=$1; - shift 1;; - # -e | --environment - The environment name you want to deploy - -e | --environment ) - shift 1; - DEP_ENV=$1; - shift 1 ;; - # -p | --port - The port from which to connect to the docker nexus - -p | --port ) - shift 1 ; - PORT=$1; - shift 1 ;; - # -l | --local - Use this for deploying your local dockers without pulling them first - -l | --local ) - LOCAL=true; - shift 1;; - # -t | --runTests - Use this for running the sanity tests docker after all other dockers have been deployed - -t | --runTests ) - RUNTESTS=true; - shift 1 ;; - # -h | --help - Display the help message with all the available run options - -h | --help ) - usage; - exit 0;; - * ) - usage; - exit 1;; - esac -done - - -[ -f ${WORKSPACE}/opt/config/env_name.txt ] && DEP_ENV=$(cat ${WORKSPACE}/opt/config/env_name.txt) || DEP_ENV=__ENV-NAME__ -[ -f ${WORKSPACE}/opt/config/nexus_username.txt ] && NEXUS_USERNAME=$(cat ${WORKSPACE}/opt/config/nexus_username.txt) || NEXUS_USERNAME=release -[ -f ${WORKSPACE}/opt/config/nexus_password.txt ] && NEXUS_PASSWD=$(cat ${WORKSPACE}/opt/config/nexus_password.txt) || NEXUS_PASSWD=sfWU3DFVdBr7GVxB85mTYgAW -[ -f ${WORKSPACE}/opt/config/nexus_docker_repo.txt ] && NEXUS_DOCKER_REPO=$(cat ${WORKSPACE}/opt/config/nexus_docker_repo.txt) || NEXUS_DOCKER_REPO=nexus3.onap.org:${PORT} -[ -f ${WORKSPACE}/opt/config/nexus_username.txt ] && docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO - - -cleanup - - -export IP=`ip route get 8.8.8.8 | awk '/src/{ print $7 }'` -#If OSX, then use this to get IP -if [[ "$OSTYPE" == "darwin"* ]]; then - export IP=$(ipconfig getifaddr en0) -fi -export PREFIX=${NEXUS_DOCKER_REPO}'/onap' - -if [ ${LOCAL} = true ]; then - PREFIX='onap' -fi - -echo "" - -healthCheck - -# sanityDocker -if [[ (${RUNTESTS} = true) && (${healthCheck_http_code} == 200) ]]; then - echo "docker run sdc-sanity..." - echo "Triger sanity docker, please wait..." - - if [ ${LOCAL} = false ]; then - docker pull ${PREFIX}/sdc-sanity:${RELEASE} - fi - -docker run --detach --name sdc-sanity --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 1500m --ulimit nofile=4096:100000 $LOCAL_TIME_MOUNT_CMD --volume ${WORKSPACE}/data/logs/sdc-sanity/target:/var/lib/tests/target --volume ${WORKSPACE}/data/logs/sdc-sanity/ExtentReport:/var/lib/tests/ExtentReport --volume ${WORKSPACE}/data/logs/sdc-sanity/outputCsar:/var/lib/tests/outputCsar --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 9560:9560 ${PREFIX}/sdc-sanity:${RELEASE} -echo "please wait while SANITY is starting....." -monitor_docker sdc-sanity - -fi -- cgit 1.2.3-korg