summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-09-18 17:32:38 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-18 17:32:38 +0000
commit1a62c1b21652ce09f216fd6e6bfa2042660b896f (patch)
tree7eabd35d5bc4d45d9256a68efc61e0e20d1c0fbd
parentc30152842c3cc868e1b2e499604a27027b488931 (diff)
parent52e39180c847b39a846d35ac638e908cc241d1fd (diff)
Merge "Fix the csit test cases for refrepo"
-rw-r--r--test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh6
-rw-r--r--test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh2
-rw-r--r--test/csit/tests/vnfsdk-marketplace/provision/enterprise2DC.csarbin32098 -> 9710 bytes
3 files changed, 7 insertions, 1 deletions
diff --git a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
index 91e931e91..e04feac41 100644
--- a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
+++ b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
@@ -17,9 +17,13 @@
# These scripts are sourced by run-csit.sh.
+#Start postgres database
+docker run -d -i -t --name=postgres -p 5432:5432 nexus3.onap.org:10001/onap/refrepo/postgres:latest
+
+POSTGRES=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' postgres`
#Start market place
-docker run -d -i -t --name=refrepo -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.0-STAGING-latest
+docker run -d -i -t --name=refrepo -e POSTGRES_IP=$POSTGRES -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.0-STAGING-latest
# Wait for Market place initialization
echo Wait for VNF Repository initialization
diff --git a/test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh b/test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh
index a42634303..19440bc79 100644
--- a/test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh
+++ b/test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh
@@ -18,4 +18,6 @@
kill-instance.sh refrepo
+kill-instance.sh postgres
+
diff --git a/test/csit/tests/vnfsdk-marketplace/provision/enterprise2DC.csar b/test/csit/tests/vnfsdk-marketplace/provision/enterprise2DC.csar
index 29e08c162..f27947955 100644
--- a/test/csit/tests/vnfsdk-marketplace/provision/enterprise2DC.csar
+++ b/test/csit/tests/vnfsdk-marketplace/provision/enterprise2DC.csar
Binary files differ