Code Review
/
cps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT: Integration tests for CPS Core
[cps.git]
/
csit
/
plans
/
default
/
setup.sh
diff --git
a/csit/plans/default/setup.sh
b/csit/plans/default/setup.sh
index
e7e8f4b
..
4d5d1c8
100755
(executable)
--- a/
csit/plans/default/setup.sh
+++ b/
csit/plans/default/setup.sh
@@
-18,6
+18,8
@@
# Modifications copyright (c) 2020-2021 Samsung Electronics Co., Ltd.
# Modifications Copyright (C) 2021 Pantheon.tech
#
# Modifications copyright (c) 2020-2021 Samsung Electronics Co., Ltd.
# Modifications Copyright (C) 2021 Pantheon.tech
#
+# Branched from ccsdk/distribution to this repository Feb 23, 2021
+#
# Copy docker-compose.yml and application.yml to archives
mkdir -p $WORKSPACE/archives/docker-compose
# Copy docker-compose.yml and application.yml to archives
mkdir -p $WORKSPACE/archives/docker-compose
@@
-31,18
+33,22
@@
export DB_PASSWORD=cps
# Use latest image version
export VERSION=latest
# Use latest image version
export VERSION=latest
+# download docker-compose of a required version (1.25.0 supports configuration of version 3.7)
+curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` > docker-compose
+chmod +x docker-compose
+
# start CPS and PostgreSQL containers with docker compose
# start CPS and PostgreSQL containers with docker compose
-docker-compose up -d
+
./
docker-compose up -d
# Validate CPS service initialization completed via periodic log checking for line like below:
# org.onap.cps.Application ... Started Application in X.XXX seconds
TIME_OUT=300
# Validate CPS service initialization completed via periodic log checking for line like below:
# org.onap.cps.Application ... Started Application in X.XXX seconds
TIME_OUT=300
-INTERVAL=
10
+INTERVAL=
5
TIME=0
while [ "$TIME" -le "$TIME_OUT" ]; do
TIME=0
while [ "$TIME" -le "$TIME_OUT" ]; do
- LOG_FOUND=$( docker-compose logs --tail="all" | grep "org.onap.cps.Application" | egrep -c "Started Application in" )
+ LOG_FOUND=$(
./
docker-compose logs --tail="all" | grep "org.onap.cps.Application" | egrep -c "Started Application in" )
if [ "$LOG_FOUND" -gt 0 ]; then
echo "CPS Service started"
if [ "$LOG_FOUND" -gt 0 ]; then
echo "CPS Service started"
@@
-59,9
+65,9
@@
if [ "$TIME" -gt "$TIME_OUT" ]; then
exit 1;
fi
exit 1;
fi
-# T
ODO localhost works on a local environment, check if it's ok on jenkins
+# T
he CPS host according to docker-compose.yml
CPS_HOST="http://localhost:8883"
# Pass variables required for Robot test suites in ROBOT_VARIABLES
CPS_HOST="http://localhost:8883"
# Pass variables required for Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v
SCRIPTS:$SCRIPTS -v CPS_HOST:$CPS_HOST
"
+ROBOT_VARIABLES="-v
CPS_HOST:$CPS_HOST -v DATADIR:$WORKSPACE/data
"