diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-04-22 16:51:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-22 16:51:09 +0000 |
| commit | 8d43285f32048a09429aff6b9326959fb8cd52b8 (patch) | |
| tree | 17c6b7fdf3ccbc8445ee5da9efa2e29d1fb7de78 | |
| parent | dbb0fcad2c692bc927db944c4f2e1786307e90b4 (diff) | |
| parent | e0eb9cec346556650ca53cb6732478d7a797d535 (diff) | |
Merge "Updated CSIT to reference new repo location"
| -rw-r--r-- | scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh | 6 | ||||
| -rw-r--r-- | scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh | 2 |
2 files changed, 4 insertions, 4 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 3b2de744..be12bfdc 100644 --- a/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh +++ b/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh @@ -28,7 +28,7 @@ echo "This is ${WORKSPACE}/scripts/cmso/clone_cmso_and_change_dockercompose.sh" 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-robot/docker/cmso-service +cd cmso/cmso-sonar/docker/integration 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 @@ -50,9 +50,9 @@ cat up.txt echo ======================= ### Wait for robot to finish -docker exec cmsoservice_cmso-robot_1 ls +docker exec integration_cmso-robot_1 ls while [ $? -ne 1 ]; do sleep 120 - docker exec cmsoservice_cmso-robot_1 ls + docker exec integration_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 5d8c0597..6b121ad7 100644 --- a/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh +++ b/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh @@ -20,7 +20,7 @@ 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 +cd cmso/cmso-sonar/docker/integration docker-compose down cp -f ./cmso-robot/logs/output.xml $WORKSPACE/archives |