aboutsummaryrefslogtreecommitdiffstats
path: root/test/csit/plans
diff options
context:
space:
mode:
authorAaron Hay <ah415j@att.com>2018-04-30 01:43:48 -0400
committerAaron Hay <ah415j@att.com>2018-04-30 04:34:16 -0400
commit570a18a7b7a7022c113237c6c14af097fac5ca3e (patch)
tree70fd1408095353be756837780982196f17ceb57e /test/csit/plans
parent006629d1a712bf256c2d50cb8ea8d1fb94612977 (diff)
Update APPC CSIT to support CDT
Update setup.sh and teardown.sh to support CDT docker pull and tag operations. Change-Id: Ibe934b4901a3fb1a006029f11ea6a202063d9b96 Issue-ID: APPC-870 Signed-off-by: Aaron Hay <ah415j@att.com>
Diffstat (limited to 'test/csit/plans')
-rwxr-xr-xtest/csit/plans/appc/healthcheck/setup.sh9
-rwxr-xr-xtest/csit/plans/appc/healthcheck/teardown.sh3
2 files changed, 8 insertions, 4 deletions
diff --git a/test/csit/plans/appc/healthcheck/setup.sh b/test/csit/plans/appc/healthcheck/setup.sh
index 014aa95dd..ef79483b4 100755
--- a/test/csit/plans/appc/healthcheck/setup.sh
+++ b/test/csit/plans/appc/healthcheck/setup.sh
@@ -21,7 +21,7 @@ SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source ${WORKSPACE}/test/csit/scripts/appc/script1.sh
export APPC_DOCKER_IMAGE_VERSION=1.3.0-SNAPSHOT-latest
-export CCSDK_DOCKER_IMAGE_VERSION=0.2.1
+export CCSDK_DOCKER_IMAGE_VERSION=0.2.1-SNAPSHOT
export BRANCH=master
export SOLUTION_NAME=onap
@@ -48,8 +48,11 @@ sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.ym
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/appc-image:$APPC_DOCKER_IMAGE_VERSION
docker tag $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/appc-image:$APPC_DOCKER_IMAGE_VERSION ${SOLUTION_NAME}/appc-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 $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION ${SOLUTION_NAME}/ccsdk-dgbuilder-image:latest
+docker pull $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/appc-cdt-image:$APPC_DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/appc-cdt-image:$APPC_DOCKER_IMAGE_VERSION ${SOLUTION_NAME}/appc-cdt-image:latest
+
# start APPC containers with docker compose and configuration from docker-compose.yml
docker-compose up -d
# WAIT 5 minutes maximum and test every 5 seconds if APPC is up using HealthCheck API
diff --git a/test/csit/plans/appc/healthcheck/teardown.sh b/test/csit/plans/appc/healthcheck/teardown.sh
index 357ead8aa..94d1bc778 100755
--- a/test/csit/plans/appc/healthcheck/teardown.sh
+++ b/test/csit/plans/appc/healthcheck/teardown.sh
@@ -18,7 +18,8 @@
#
kill-instance.sh appc_controller_container
-kill-instance.sh sdnc_dgbuilder_container
+kill-instance.sh ccsdk_dgbuilder_container
+kill-instance.sh appc_cdt_container
kill-instance.sh sdnc_db_container
# $WORKSPACE/archives/appc deleted with archives folder when tests starts so we keep it at the end for debugging