diff options
Diffstat (limited to 'test/csit/plans')
| -rwxr-xr-x | test/csit/plans/integration/vCPE/setup.sh | 12 | ||||
| -rwxr-xr-x | test/csit/plans/integration/vCPE/teardown.sh | 3 | ||||
| -rw-r--r-- | test/csit/plans/integration/vCPE/testplan.txt | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/test/csit/plans/integration/vCPE/setup.sh b/test/csit/plans/integration/vCPE/setup.sh index c18f62207..a30b9b62f 100755 --- a/test/csit/plans/integration/vCPE/setup.sh +++ b/test/csit/plans/integration/vCPE/setup.sh @@ -15,20 +15,18 @@ # limitations under the License. # # Place the scripts in run order: -source ${WORKSPACE}/test/csit/scripts/integration/script1.sh -docker run --name i-mock -d jamesdbloom/mockserver -MOCK_IP=`get-instance-ip.sh i-mock` +run-instance.sh nexus3.onap.org:10001/openecomp/mso i-so "" + +SO_IP=`get-instance-ip.sh i-so` # Wait for initialization for i in {1..10}; do - curl -sS ${MOCK_IP}:1080 && break + curl -sS ${SO_IP}:8080 && break echo sleep $i sleep $i done -${WORKSPACE}/test/csit/scripts/integration/mock-hello.sh ${MOCK_IP} - # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP}" +ROBOT_VARIABLES="-v SO_IP:${SO_IP}" diff --git a/test/csit/plans/integration/vCPE/teardown.sh b/test/csit/plans/integration/vCPE/teardown.sh index acf2d0976..b19785972 100755 --- a/test/csit/plans/integration/vCPE/teardown.sh +++ b/test/csit/plans/integration/vCPE/teardown.sh @@ -15,6 +15,5 @@ # limitations under the License. # -kill-instance.sh i-mock - +kill-instance.sh i-so diff --git a/test/csit/plans/integration/vCPE/testplan.txt b/test/csit/plans/integration/vCPE/testplan.txt index 7a29ca53d..2b3d4ad5d 100644 --- a/test/csit/plans/integration/vCPE/testplan.txt +++ b/test/csit/plans/integration/vCPE/testplan.txt @@ -1,4 +1,3 @@ # Test suites are relative paths under [integration.git]/test/csit/tests/. # Place the suites in run order. -integration/suite1 -integration/suite2 +integration/vCPE |