summaryrefslogtreecommitdiffstats
path: root/test/csit
diff options
context:
space:
mode:
authorFu Jinhua <fu.jinhua@zte.com.cn>2017-09-05 11:09:39 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-05 11:09:39 +0000
commit5a688a576dcad84d3b930b9af48207e13fd0a9a5 (patch)
treeae810b1952cb8d1719ca33fdff1661e4a98db344 /test/csit
parent18bf4af3a4f0ce9f78cbf022821f54849ce2723d (diff)
parenta9bba2fc7b2fb0a3a36f2fc1e17ca2aa8ebe6c56 (diff)
Merge "Change the DB to PostgreSQL"
Diffstat (limited to 'test/csit')
-rw-r--r--test/csit/plans/holmes/sanity-check/setup.sh14
-rw-r--r--test/csit/scripts/holmes/engine-management/startup.sh2
-rw-r--r--test/csit/scripts/holmes/rule-management/startup.sh2
3 files changed, 9 insertions, 9 deletions
diff --git a/test/csit/plans/holmes/sanity-check/setup.sh b/test/csit/plans/holmes/sanity-check/setup.sh
index d3214e00e..cbe107c16 100644
--- a/test/csit/plans/holmes/sanity-check/setup.sh
+++ b/test/csit/plans/holmes/sanity-check/setup.sh
@@ -17,10 +17,10 @@
# Place the scripts in run order:
# Download and start MySQL
-docker pull mysql/mysql-server
-docker run --name mysql-holmes -e MYSQL_ROOT_PASSWORD=rootpass -e MYSQL_ROOT_HOST=% -d mysql/mysql-server
-MYSQL_IP=`get-instance-ip.sh mysql-holmes`
-echo MYSQL_IP=${MYSQL_IP}
+docker pull postgresql:9.5
+docker run --name postgres-holmes -p 5432:5432 -e POSTGRES_USER=holmes -e POSTGRES_PASSWORD=holmespwd -d postgres:9.5
+DB_IP=`get-instance-ip.sh postgres-holmes`
+echo DB_IP=${DB_IP}
#login to the onap nexus docker repo
docker login -u docker -p docker nexus3.onap.org:10001
@@ -33,11 +33,11 @@ docker run -d -p 10081:10081 -e CONSUL_IP=$CONSUL_IP --name msb_discovery nexus3
DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
echo DISCOVERY_IP=${DISCOVERY_IP}
docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
-MSB_IP==`get-instance-ip.sh msb_internal_apigateway`
+MSB_IP=`get-instance-ip.sh msb_internal_apigateway`
echo MSB_IP=${MSB_IP}
# Start rulemgt
-source ${SCRIPTS}/holmes/rule-management/startup.sh i-rulemgt ${MYSQL_IP} ${MSB_IP} 80
+source ${SCRIPTS}/holmes/rule-management/startup.sh i-rulemgt ${DB_IP} ${MSB_IP} 80
RULEMGT_IP=`get-instance-ip.sh i-rulemgt`
echo RULEMGT_IP=${RULEMGT_IP}
@@ -49,7 +49,7 @@ for i in {1..20}; do
done
# Start engine-d
-source ${SCRIPTS}/holmes/engine-management/startup.sh i-engine-d ${MYSQL_IP} ${MSB_IP} 80
+source ${SCRIPTS}/holmes/engine-management/startup.sh i-engine-d ${DB_IP} ${MSB_IP} 80
ENGINE_D_IP=`get-instance-ip.sh i-engine-d`
echo ENGINE_D_IP=${ENGINE_D_IP}
diff --git a/test/csit/scripts/holmes/engine-management/startup.sh b/test/csit/scripts/holmes/engine-management/startup.sh
index 321ac6b3e..7d6ec241d 100644
--- a/test/csit/scripts/holmes/engine-management/startup.sh
+++ b/test/csit/scripts/holmes/engine-management/startup.sh
@@ -20,4 +20,4 @@
docker login -u docker -p docker nexus3.onap.org:10001
-run-instance.sh nexus3.onap.org:10001/onap/holmes/engine-management:latest $1 "-e URL_JDBC=$2:3306 -e MSB_ADDR=$3 -e MSB_PORT=$4"
+run-instance.sh nexus3.onap.org:10001/onap/holmes/engine-management:latest $1 "-e URL_JDBC=$2:5432 -e MSB_ADDR=$3 -e MSB_PORT=$4"
diff --git a/test/csit/scripts/holmes/rule-management/startup.sh b/test/csit/scripts/holmes/rule-management/startup.sh
index cbfd13ad7..a4cc0a806 100644
--- a/test/csit/scripts/holmes/rule-management/startup.sh
+++ b/test/csit/scripts/holmes/rule-management/startup.sh
@@ -19,4 +19,4 @@
docker login -u docker -p docker nexus3.onap.org:10001
-run-instance.sh nexus3.onap.org:10001/onap/holmes/rule-management:latest $1 "-e URL_JDBC=$2:3306 -e MSB_ADDR=$3 -e MSB_PORT=$4" \ No newline at end of file
+run-instance.sh nexus3.onap.org:10001/onap/holmes/rule-management:latest $1 "-e URL_JDBC=$2:5432 -e MSB_ADDR=$3 -e MSB_PORT=$4" \ No newline at end of file