diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-10-09 17:24:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-09 17:24:21 +0000 |
| commit | c5f1ee852ad1ec2f0e968efd4191c3c026b4fcc5 (patch) | |
| tree | 865d5d0b769dd06e4df10f0f7c74d4d73865fd8c /plans | |
| parent | 3ef5e6dda086923f4ef70d3b0e820674a5cdcd82 (diff) | |
| parent | 73792ad8099d86f20b0a492ef13df225eb4ca9c4 (diff) | |
Merge "Add ansible server for APPC CSIT"
Diffstat (limited to 'plans')
| -rwxr-xr-x | plans/appc/healthcheck/setup.sh | 13 | ||||
| -rwxr-xr-x | plans/appc/healthcheck/teardown.sh | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/plans/appc/healthcheck/setup.sh b/plans/appc/healthcheck/setup.sh index 0ea9f925..5e34afba 100755 --- a/plans/appc/healthcheck/setup.sh +++ b/plans/appc/healthcheck/setup.sh @@ -21,7 +21,8 @@ SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source ${WORKSPACE}/scripts/appc/script1.sh export APPC_DOCKER_IMAGE_VERSION=1.4.0-SNAPSHOT-latest -export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest +export DGBUILDER_DOCKER_IMAGE_VERSION=0.3.0 +export ANSIBLE_DOCKER_IMAGE_VERSION=0.3.0 export BRANCH=master export SOLUTION_NAME=onap @@ -46,10 +47,16 @@ git pull cd $WORKSPACE/archives/appc/docker-compose sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.yml 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/${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}/ccsdk-dgbuilder-image:$DGBUILDER_DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/ccsdk-dgbuilder-image:$DGBUILDER_DOCKER_IMAGE_VERSION ${SOLUTION_NAME}/ccsdk-dgbuilder-image:latest + +docker pull $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/ccsdk-ansible-server-image:$ANSIBLE_DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/ccsdk-ansible-server-image:$ANSIBLE_DOCKER_IMAGE_VERSION ${SOLUTION_NAME}/ccsdk-ansible-server-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 diff --git a/plans/appc/healthcheck/teardown.sh b/plans/appc/healthcheck/teardown.sh index 94d1bc77..066c764c 100755 --- a/plans/appc/healthcheck/teardown.sh +++ b/plans/appc/healthcheck/teardown.sh @@ -17,9 +17,10 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -kill-instance.sh appc_controller_container +kill-instance.sh ccsdk_ansible_container kill-instance.sh ccsdk_dgbuilder_container kill-instance.sh appc_cdt_container +kill-instance.sh appc_controller_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 |