diff options
| author |   Jerry Flood <jflood@att.com> | 2019-04-09 13:54:19 -0400 |
|---|---|---|
| committer | Jerry Flood <jflood@att.com> | 2019-04-09 19:33:13 -0400 |
| commit | c8e54769b04cee3f2b9aee83a753a82a3bd7abf2 (patch) | |
| tree | 3ea7b332b28da03738e3aba2d2cab297e55d6a71 /scripts/optf-cmso | |
| parent | 166a129effc579e899713bfc526a17862ea23484 (diff) | |
Update CSIT job for CMSO Dublin
Issue-ID: OPTFRA-472
Change-Id: I80fc67473179ef2aa2d8fe559b5dd513cee7dbe7
Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'scripts/optf-cmso')
| -rw-r--r-- | scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh | 32 | ||||
| -rw-r--r-- | scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh | 13 |
2 files changed, 33 insertions, 12 deletions
diff --git a/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh b/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh index 03fca804..3b2de744 100644 --- a/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh +++ b/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh @@ -25,14 +25,34 @@ echo "This is ${WORKSPACE}/scripts/cmso/clone_cmso_and_change_dockercompose.sh" # Clone cmso repo to get extra folder that has all needed to run docker with docker-compose to start DB and cmso-service and cmso-dbinit -mkdir -p $WORKSPACE/archives/cmso-clone -cd $WORKSPACE/archives/cmso-clone +mkdir -p /tmp/$WORKSPACE/archives/cmso-clone +cd /tmp/$WORKSPACE/archives/cmso-clone git clone --depth 1 https://gerrit.onap.org/r/optf/cmso -b master -cd cmso/cmso-service/extra/docker +cd cmso/cmso-robot/docker/cmso-service -# Pull the cmso docker image from nexus instead of local image by default in the docker-compose.yml -sed -i '/image: onap\/optf-cmso-service/c\ image: nexus3.onap.org:10001\/onap\/optf-cmso-service' docker-compose.yml +sed -i '/image: onap\/optf-cmso-service/c\ image: nexus3.onap.org:10001\/onap\/optf-cmso-service:latest' docker-compose.yml +sed -i '/image: onap\/optf-cmso-dbinit/c\ image: nexus3.onap.org:10001\/onap\/optf-cmso-dbinit:latest' docker-compose.yml +sed -i '/image: onap\/optf-cmso-topology/c\ image: nexus3.onap.org:10001\/onap\/optf-cmso-topology:latest' docker-compose.yml +sed -i '/image: onap\/optf-cmso-ticketmgt/c\ image: nexus3.onap.org:10001\/onap\/optf-cmso-ticketmgt:latest' docker-compose.yml +sed -i '/image: onap\/optf-cmso-optimizer/c\ image: nexus3.onap.org:10001\/onap\/optf-cmso-optimizer:latest' docker-compose.yml +sed -i '/image: onap\/optf-cmso-robot/c\ image: nexus3.onap.org:10001\/onap\/optf-cmso-robot:latest' docker-compose.yml -sed -i '/image: onap\/optf-cmso-dbinit/c\ image: nexus3.onap.org:10001\/onap\/optf-cmso-dbinit' docker-compose.yml +pip uninstall docker-py; pip uninstall docker; pip install docker +#!/bin/bash +docker-compose up >up.txt 2>&1 & + + +### Wait for docker compose to complete +sleep 300 +echo =======================up.txt +cat up.txt +echo ======================= + +### Wait for robot to finish +docker exec cmsoservice_cmso-robot_1 ls +while [ $? -ne 1 ]; do + sleep 120 + docker exec cmsoservice_cmso-robot_1 ls +done diff --git a/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh b/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh index 681099ca..5d8c0597 100644 --- a/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh +++ b/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh @@ -19,13 +19,14 @@ # echo "This is ${WORKSPACE}/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh" +cd /tmp/$WORKSPACE/archives/cmso-clone +cd cmso/cmso-robot/docker/cmso-service +docker-compose down -kill-instance.sh cmso-service -kill-instance.sh cmso-mariadb -kill-instance.sh cmso-db-init +cp -f ./cmso-robot/logs/output.xml $WORKSPACE/archives +cp -f ./cmso-robot/logs/log.html $WORKSPACE/archives +cp -f ./cmso-robot/logs/report.html $WORKSPACE/archives -#delete cmso-clone folder - -rm -rf ${WORKSPACE}archives/cmso-clone +##rm -rf ${WORKSPACE}/archives/cmso-clone |