diff options
| author |   Stilwell, David (stilwelld) <stilwelld@att.com> | 2017-09-27 18:08:35 +0000 |
|---|---|---|
| committer | Stilwell, David (stilwelld) <stilwelld@att.com> | 2017-09-27 20:04:33 +0000 |
| commit | cfbb8b16be5591adc18b8aea28b662bdf6e0a374 (patch) | |
| tree | 96730d28d9ae1b93d3c95bf4ddf0a13c8e081de6 /test/csit/plans/sdnc | |
| parent | 0bf24a8901a5a2b7c5b861f9b281321c251fe618 (diff) | |
Fix healthcheck issues with sdnc and ccsdk
Fix listen port for ccsdk, fix image download with sdnc, fixed teardown.sh to bring down dgbuilder.
Change-Id: Ib0d6c85a6f75fdfbc46dc88d6db4fdaf9296fadf
Issue-ID: INT-230
Signed-off-by: Stilwell, David (stilwelld) <stilwelld@att.com>
Diffstat (limited to 'test/csit/plans/sdnc')
| -rw-r--r-- | test/csit/plans/sdnc/healthcheck/health_check.sh | 2 | ||||
| -rw-r--r-- | test/csit/plans/sdnc/healthcheck/setup.sh | 21 |
2 files changed, 16 insertions, 7 deletions
diff --git a/test/csit/plans/sdnc/healthcheck/health_check.sh b/test/csit/plans/sdnc/healthcheck/health_check.sh index 96c99848a..e8b5056d4 100644 --- a/test/csit/plans/sdnc/healthcheck/health_check.sh +++ b/test/csit/plans/sdnc/healthcheck/health_check.sh @@ -17,6 +17,8 @@ SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo $SCRIPTS +unset http_proxy https_proxy + response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-sdnc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck ) if [ "$response" == "200" ]; then diff --git a/test/csit/plans/sdnc/healthcheck/setup.sh b/test/csit/plans/sdnc/healthcheck/setup.sh index 643d54fe9..3db43559a 100644 --- a/test/csit/plans/sdnc/healthcheck/setup.sh +++ b/test/csit/plans/sdnc/healthcheck/setup.sh @@ -20,6 +20,13 @@ SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source ${WORKSPACE}/test/csit/scripts/sdnc/script1.sh +export NEXUS_USERNAME=docker +export NEXUS_PASSWD=docker +export NEXUS_DOCKER_REPO=nexus3.onap.org:10003 +export DMAAP_TOPIC=AUTO +export DOCKER_IMAGE_VERSION=1.2-STAGING-latest +export CCSDK_DOCKER_IMAGE_VERSION=0.1-STAGING-latest + export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) if [ "$MTU" == "" ]; then @@ -37,16 +44,16 @@ unset http_proxy https_proxy cd $WORKSPACE/archives/sdnc/installation/src/main/yaml sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" docker-compose.yml -docker login -u docker -p docker nexus3.onap.org:10001 +docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull nexus3.onap.org:10001/onap/sdnc-image:latest -docker tag nexus3.onap.org:10001/onap/sdnc-image:latest onap/sdnc-image:latest +docker pull $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION onap/sdnc-image:latest -docker pull nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:latest -docker tag nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:latest onap/ccsdk-dgbuilder-image:latest +docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest -docker pull nexus3.onap.org:10001/onap/admportal-sdnc-image:latest -docker tag nexus3.onap.org:10001/onap/admportal-sdnc-image:latest onap/admportal-sdnc-image:latest +docker pull $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION onap/admportal-sdnc-image:latest # start SDNC containers with docker compose and configuration from docker-compose.yml curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > docker-compose |