diff options
| author |   econwar <conor.ward@ericsson.com> | 2018-08-09 14:21:29 +0000 |
|---|---|---|
| committer | econwar <conor.ward@ericsson.com> | 2018-08-09 14:21:29 +0000 |
| commit | 18088d8304026be6d7720f37d1aaea6d9b5dcede (patch) | |
| tree | 15e6f2edbaa07d172db504f9266535ba62e8c148 /test/csit/plans/dmaap-datarouter | |
| parent | 5d08958636a11ec9d570a995f09fa09f6e14de49 (diff) | |
Add Publish to Feed Test Case
Change-Id: I5926771744ce870690388c9dcaf7bbbd1f21862d
Signed-off-by: Conor Ward <conor.ward@ericsson.com>
Issue-ID: DMAAP-564
Diffstat (limited to 'test/csit/plans/dmaap-datarouter')
| -rwxr-xr-x | test/csit/plans/dmaap-datarouter/dr-suite/setup.sh | 7 | ||||
| -rwxr-xr-x | test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh b/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh index 3e02a0d74..d72fe1f12 100755 --- a/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh +++ b/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh @@ -30,16 +30,15 @@ for i in {1..50}; do done DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov) +DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node) DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov) echo DR_PROV_IP=${DR_PROV_IP} +echo DR_NODE_IP=${DR_NODE_IP} echo DR_GATEWAY_IP=${DR_GATEWAY_IP} -echo "Sleep 15 seconds to allow startup script to execute on datarouter-prov container" -sleep 15 - docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=node.datarouternew.com\|$DR_GATEWAY_IP" docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=prov.datarouternew.com\|$DR_GATEWAY_IP" #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP}" +ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP}" diff --git a/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh b/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh index 546bea6d6..e5a7f2527 100755 --- a/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh +++ b/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh @@ -1,5 +1,4 @@ #!/bin/bash -kill-instance.sh datarouter-node -kill-instance.sh datarouter-prov -kill-instance.sh mariadb +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-prov/src/main/resources/docker-compose/ +docker-compose down -v |