From 4412d8e365bf7c3485eb5b90ba20d913797b6000 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Mon, 3 Jun 2019 21:34:09 -0400 Subject: Remove obsolete files for optf/cmso Issue-ID: OPTFRA-517 Change-Id: I34adbe4284c39041c44b70fce9677e9a64f5b3da Signed-off-by: Jerry Flood --- scripts/optf-cmso/cmso/start_cmso_containers.sh | 53 ------------------------- scripts/optf-cmso/cmso/wait_for_port.sh | 36 ----------------- 2 files changed, 89 deletions(-) delete mode 100644 scripts/optf-cmso/cmso/start_cmso_containers.sh delete mode 100755 scripts/optf-cmso/cmso/wait_for_port.sh (limited to 'scripts') diff --git a/scripts/optf-cmso/cmso/start_cmso_containers.sh b/scripts/optf-cmso/cmso/start_cmso_containers.sh deleted file mode 100644 index ded86d7c..00000000 --- a/scripts/optf-cmso/cmso/start_cmso_containers.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# -# ------------------------------------------------------------------------- -# Copyright (c) 2018 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -echo "This is ${WORKSPACE}/scripts/opft-cmso/cmso/start_cmso_containers.sh" - -DB_IMAGE_VERSION=1.0-SNAPSHOT-latest -SERVICE_IMAGE_VERSION=1.0-SNAPSHOT-latest - -# start cmso mariadb and db-init containers with docker compose and configuration from cmso/cmso-service/extra/docker/cmso-service/docker-compose.yml - -docker run -p 3306:3306 --name cmso-mariadb -v $(pwd)/mariadb/conf1:/etc/mysql/conf.d -e MYSQL_ROOT_PASSWORD=beer -d mariadb:10.1.11 - -CMSO_DB_IP=`get-instance-ip.sh cmso-mariadb` - -${WORKSPACE}/scripts/optf-osdf/osdf/wait_for_port.sh ${CMSO_DB_IP} 3306 - -sed -i -e "s%192.168.56.101:3306%${CMSO_DB_IP}:3306%g" ./etc/config/cmso.properties -sed -i -e "s%192.168.56.101:3306%${CMSO_DB_IP}:3306%g" ./etc/config/liquibase.properties - - -docker run --name cmso-db-init -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs \ - -d nexus3.onap.org:10001/onap/optf-cmso-dbinit:${DB_IMAGE_VERSION} - -sleep 30 - -docker run --name cmso-service -p 8080:8080 -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs\ - -v $(pwd)/debug-logs:/share/debug-logs -d nexus3.onap.org:10001/onap/optf-cmso-service:${SERVICE_IMAGE_VERSION} - -CMSO_SERVICE_IP=`get-instance-ip.sh cmso-service` - -${WORKSPACE}/scripts/optf-osdf/osdf/wait_for_port.sh ${CMSO_SERVICE_IP} 8080 - - -ROBOT_VARIABLES="-v GLOBAL_SCHEDULER_HOST:${CMSO_SERVICE_IP}" - -echo ${ROBOT_VARIABLES} \ No newline at end of file diff --git a/scripts/optf-cmso/cmso/wait_for_port.sh b/scripts/optf-cmso/cmso/wait_for_port.sh deleted file mode 100755 index 360fc210..00000000 --- a/scripts/optf-cmso/cmso/wait_for_port.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# -# ------------------------------------------------------------------------- -# Copyright (c) 2018 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -if [[ $# -ne 2 ]]; then - echo "Usage: wait-for-port hostname port" >&2 - exit 1 -fi - -host=$1 -port=$2 - -echo "Waiting for $host port $port open" -until telnet $host $port /dev/null | grep -q '^Connected'; do - sleep 1 -done - -echo "$host port $port is open" - -exit 0 -- cgit 1.2.3-korg