From d44fceebbd37108a15f45fbf5813d413efeb2ac6 Mon Sep 17 00:00:00 2001 From: Ruslan Kashapov Date: Fri, 26 Feb 2021 11:42:29 +0200 Subject: CSIT: Integration tests for CPS Core + also fixes issue with fragment_id sequence not reflecting data loaded Issue-ID: CPS-261 Change-Id: If590d6a0859a1acc9005dd2da952b7dd93a23059 Signed-off-by: Ruslan Kashapov --- csit/plans/default/setup.sh | 16 +++++++++++----- csit/plans/default/teardown.sh | 4 +++- csit/plans/default/testplan.txt | 2 ++ 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'csit/plans') diff --git a/csit/plans/default/setup.sh b/csit/plans/default/setup.sh index e7e8f4bfc..4d5d1c85c 100755 --- 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 # +# 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 @@ -31,18 +33,22 @@ export DB_PASSWORD=cps # 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 -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 -INTERVAL=10 +INTERVAL=5 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" @@ -59,9 +65,9 @@ if [ "$TIME" -gt "$TIME_OUT" ]; then exit 1; fi -# TODO localhost works on a local environment, check if it's ok on jenkins +# The CPS host according to docker-compose.yml 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" diff --git a/csit/plans/default/teardown.sh b/csit/plans/default/teardown.sh index 90280259c..f9368f9df 100755 --- a/csit/plans/default/teardown.sh +++ b/csit/plans/default/teardown.sh @@ -18,6 +18,8 @@ # Modifications copyright (c) 2020 Samsung Electronics Co., Ltd. # Modifications Copyright (C) 2021 Pantheon.tech # +# Branched from ccsdk/distribution to this repository Feb 23, 2021 +# cd $WORKSPACE/archives/docker-compose -docker-compose down -v +./docker-compose down -v diff --git a/csit/plans/default/testplan.txt b/csit/plans/default/testplan.txt index edcad0dfd..e4e875988 100644 --- a/csit/plans/default/testplan.txt +++ b/csit/plans/default/testplan.txt @@ -1,4 +1,6 @@ # Test suites are relative paths under csit/tests/. # Place the suites in run order. actuator +cps-admin +cps-data -- cgit 1.2.3-korg