diff options
| author |   dyh <dengyuanhong@chinamobile.com> | 2020-07-27 16:40:34 +0800 |
|---|---|---|
| committer | dyh <dengyuanhong@chinamobile.com> | 2020-07-28 16:10:44 +0800 |
| commit | f5f137474a93d9c2ebd107c06fa4010104791c67 (patch) | |
| tree | 6a7cfaaa0e09ef3b1bf1f26f52343620f9a96a87 /plans/modeling-etsicatalog/sanity-check | |
| parent | c45b79895881ef5dd12c3f97227c08b3dae5e0c6 (diff) | |
Remove dependency on VFC db in csit
Issue-ID: MODELING-402
Change-Id: I2a8d0130050e667a210f2b57e4ee16bfdf78b38d
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
Diffstat (limited to 'plans/modeling-etsicatalog/sanity-check')
| -rw-r--r-- | plans/modeling-etsicatalog/sanity-check/setup.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plans/modeling-etsicatalog/sanity-check/setup.sh b/plans/modeling-etsicatalog/sanity-check/setup.sh index 9157c41d..e713af21 100644 --- a/plans/modeling-etsicatalog/sanity-check/setup.sh +++ b/plans/modeling-etsicatalog/sanity-check/setup.sh @@ -33,9 +33,9 @@ docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP -e " MSB_IP==`get-instance-ip.sh msb_internal_apigateway` echo MSB_IP=${MSB_IP} -docker run -d -p 3306:3306 --name vfc-db -v /var/lib/mysql nexus3.onap.org:10001/onap/vfc/db -VFC_DB_IP=`get-instance-ip.sh vfc-db` -echo VFC_DB_IP=${VFC_DB_IP} +docker run -d -p 3306:3306 --name vfc-db -v /var/lib/mysql -e MYSQL_ROOT_PASSWORD=root nexus3.onap.org:10001/library/mariadb +DB_IP=`get-instance-ip.sh vfc-db` +echo DB_IP=${DB_IP} # Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway) for i in {1..10}; do @@ -46,7 +46,7 @@ done # Wait for initialization(3306 DB) for i in {1..3}; do - curl -sS -m 1 ${VFC_DB_IP}:3306 && break + curl -sS -m 1 ${DB_IP}:3306 && break echo sleep $i sleep $i done @@ -56,7 +56,7 @@ echo sleep 60 sleep 60 # start modeling-etsicatalog -docker run -d --name modeling-etsicatalog -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/modeling/etsicatalog +docker run -d --name modeling-etsicatalog -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${DB_IP}:3306 nexus3.onap.org:10001/onap/modeling/etsicatalog EtsiCatalog_IP=`get-instance-ip.sh modeling-etsicatalog` for i in {1..10}; do curl -sS -m 1 ${EtsiCatalog_IP}:8806 && break |