diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2020-10-29 12:51:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-10-29 12:51:20 +0000 |
| commit | e697a2c14c43b3339cda9c76958414b552888fa0 (patch) | |
| tree | 699d2de7b5ba84836f2b65e96341015ea1da406e /plans | |
| parent | f02c14dcebf64ace76a35002c371044cd327ef34 (diff) | |
| parent | 3f19647b0bb1cca61b1314e09c91d2298b8ab4f7 (diff) | |
Merge "Update cli tests and plans scripts"
Diffstat (limited to 'plans')
| -rw-r--r-- | plans/cli/sanity-check/setup.sh | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/plans/cli/sanity-check/setup.sh b/plans/cli/sanity-check/setup.sh index 7945ff56..5050cb6e 100644 --- a/plans/cli/sanity-check/setup.sh +++ b/plans/cli/sanity-check/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 Huawei Technologies Co., Ltd. +# Copyright 2020 Huawei Technologies Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,33 +15,11 @@ # limitations under the License. # # Place the scripts in run order: -source ${SCRIPTS}/common_functions.sh - -#start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 -MSB_CONSUL_IP=`get-instance-ip.sh msb_consul` -echo MSB_CONSUL_IP=${MSB_CONSUL_IP} - -docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery -MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery` -echo DISCOVERY_IP=${MSB_DISCOVERY_IP} - -docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway -MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway` -echo MSB_IAG_IP=${MSB_IAG_IP} -# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway) -for i in {1..10}; do - curl -sS -m 1 ${MSB_CONSUL_IP}:8500 && curl -sS -m 1 ${MSB_DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IAG_IP}:80 && break - echo sleep $i - sleep $i -done - -#Need some time for the initialization of MSB services -sleep 60 +source ${SCRIPTS}/common_functions.sh # Start cli -docker run -d --name cli -e CLI_MODE=daemon nexus3.onap.org:10001/onap/cli:v1.1.0 +docker run -d --name cli -e OPEN_CLI_MODE=daemon nexus3.onap.org:10001/onap/cli:6.0.0 # Wait for cli initialization echo Wait for CLI initialization @@ -52,4 +30,4 @@ done CLI_IP=`get-instance-ip.sh cli` # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v CLI_IP:${CLI_IP} -v MSB_IAG_IP:${MSB_IAG_IP}" +ROBOT_VARIABLES="-v CLI_IP:${CLI_IP}" |