summaryrefslogtreecommitdiffstats
path: root/test/csit/plans/clamp
diff options
context:
space:
mode:
Diffstat (limited to 'test/csit/plans/clamp')
-rwxr-xr-xtest/csit/plans/clamp/TCA/setup.sh31
-rwxr-xr-xtest/csit/plans/clamp/TCA/teardown.sh3
-rwxr-xr-xtest/csit/plans/clamp/UIs/setup.sh31
-rwxr-xr-xtest/csit/plans/clamp/UIs/teardown.sh3
4 files changed, 6 insertions, 62 deletions
diff --git a/test/csit/plans/clamp/TCA/setup.sh b/test/csit/plans/clamp/TCA/setup.sh
index 6398827bc..bb7a81447 100755
--- a/test/csit/plans/clamp/TCA/setup.sh
+++ b/test/csit/plans/clamp/TCA/setup.sh
@@ -17,37 +17,10 @@
# Modifications copyright (c) 2017 AT&T Intellectual Property
#
# Place the scripts in run order:
-source ${WORKSPACE}/test/csit/scripts/clamp/script1.sh
-# Clone Clamp repo to get extra folder that has all needed to run docker with docker-compose to start DB and Clamp
-mkdir -p $WORKSPACE/archives/clamp-clone
-cd $WORKSPACE/archives/clamp-clone
-git clone --depth 1 http://gerrit.onap.org/r/clamp -b master
-cd clamp/extra/docker/clamp/
+source ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
-# start Clamp and MariaDB containers with docker compose and configuration from clamp/extra/docker/clamp/docker-compose.yml
-docker-compose up -d
-
-# WAIT 5 minutes maximum and test every 5 seconds if Clamp up using HealthCheck API
-TIME_OUT=300
-INTERVAL=5
-TIME=0
-while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/restservices/clds/v1/clds/healthcheck); echo $response
-
- if [ "$response" == "200" ]; then
- echo Clamp and its database well started in $TIME seconds
- break;
- fi
-
- echo Sleep: $INTERVAL seconds before testing if Clamp is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
- sleep $INTERVAL
- TIME=$(($TIME+$INTERVAL))
-done
-
-if [ "$TIME" -ge "$TIME_OUT" ]; then
- echo TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests...
-fi
+source ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
#ROBOT_VARIABLES="-v TEST:${TEST}"
diff --git a/test/csit/plans/clamp/TCA/teardown.sh b/test/csit/plans/clamp/TCA/teardown.sh
index 1d1e2186e..07067e60e 100755
--- a/test/csit/plans/clamp/TCA/teardown.sh
+++ b/test/csit/plans/clamp/TCA/teardown.sh
@@ -17,7 +17,6 @@
# Modifications copyright (c) 2017 AT&T Intellectual Property
#
-kill-instance.sh clamp_clamp_1
-kill-instance.sh clamp_db_1
+source ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
# $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging
diff --git a/test/csit/plans/clamp/UIs/setup.sh b/test/csit/plans/clamp/UIs/setup.sh
index 6398827bc..bb7a81447 100755
--- a/test/csit/plans/clamp/UIs/setup.sh
+++ b/test/csit/plans/clamp/UIs/setup.sh
@@ -17,37 +17,10 @@
# Modifications copyright (c) 2017 AT&T Intellectual Property
#
# Place the scripts in run order:
-source ${WORKSPACE}/test/csit/scripts/clamp/script1.sh
-# Clone Clamp repo to get extra folder that has all needed to run docker with docker-compose to start DB and Clamp
-mkdir -p $WORKSPACE/archives/clamp-clone
-cd $WORKSPACE/archives/clamp-clone
-git clone --depth 1 http://gerrit.onap.org/r/clamp -b master
-cd clamp/extra/docker/clamp/
+source ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
-# start Clamp and MariaDB containers with docker compose and configuration from clamp/extra/docker/clamp/docker-compose.yml
-docker-compose up -d
-
-# WAIT 5 minutes maximum and test every 5 seconds if Clamp up using HealthCheck API
-TIME_OUT=300
-INTERVAL=5
-TIME=0
-while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/restservices/clds/v1/clds/healthcheck); echo $response
-
- if [ "$response" == "200" ]; then
- echo Clamp and its database well started in $TIME seconds
- break;
- fi
-
- echo Sleep: $INTERVAL seconds before testing if Clamp is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
- sleep $INTERVAL
- TIME=$(($TIME+$INTERVAL))
-done
-
-if [ "$TIME" -ge "$TIME_OUT" ]; then
- echo TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests...
-fi
+source ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
#ROBOT_VARIABLES="-v TEST:${TEST}"
diff --git a/test/csit/plans/clamp/UIs/teardown.sh b/test/csit/plans/clamp/UIs/teardown.sh
index 1d1e2186e..07067e60e 100755
--- a/test/csit/plans/clamp/UIs/teardown.sh
+++ b/test/csit/plans/clamp/UIs/teardown.sh
@@ -17,7 +17,6 @@
# Modifications copyright (c) 2017 AT&T Intellectual Property
#
-kill-instance.sh clamp_clamp_1
-kill-instance.sh clamp_db_1
+source ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
# $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging