From b21b56af4161ac449b1996122945cf6b9bc41323 Mon Sep 17 00:00:00 2001 From: eh552t Date: Wed, 23 Aug 2017 13:44:54 +0200 Subject: Clamp docker image from nexus3 and refactor Take clamp docker image from nexus3.onap.org instead of default + refactor scripts Change-Id: I87286c2ff4d56f508675a106692b80a69e8be02b Signed-off-by: eh552t Issue-Id: CLAMP-33 --- test/csit/plans/clamp/TCA/setup.sh | 31 +------------- test/csit/plans/clamp/TCA/teardown.sh | 3 +- test/csit/plans/clamp/UIs/setup.sh | 31 +------------- test/csit/plans/clamp/UIs/teardown.sh | 3 +- .../clamp/clone_clamp_and_change_dockercompose.sh | 35 +++++++++++++++ .../kill_and_remove_clamp_and_db_containers.sh | 25 +++++++++++ test/csit/scripts/clamp/script1.sh | 20 --------- test/csit/scripts/clamp/start_clamp_containers.sh | 50 ++++++++++++++++++++++ 8 files changed, 116 insertions(+), 82 deletions(-) create mode 100755 test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh create mode 100755 test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh delete mode 100755 test/csit/scripts/clamp/script1.sh create mode 100755 test/csit/scripts/clamp/start_clamp_containers.sh 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 diff --git a/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh b/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh new file mode 100755 index 000000000..f3b080ea1 --- /dev/null +++ b/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# +# ============LICENSE_START======================================================= +# ONAP CLAMP +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END============================================ +# =================================================================== +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# + +echo "This is ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.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/ + +# Pull the Clamp docker image from nexus instead of local image by default in the docker-compose.yml +sed -i '/image: onap\/clamp/c\ image: nexus3.onap.org:10001\/onap\/clamp' docker-compose.yml + diff --git a/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh b/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh new file mode 100755 index 000000000..c51464300 --- /dev/null +++ b/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# +# Copyright 2016-2017 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Modifications copyright (c) 2017 AT&T Intellectual Property +# + +echo "This is ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh" + +kill-instance.sh clamp_clamp_1 +kill-instance.sh clamp_db_1 + +# $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/scripts/clamp/script1.sh b/test/csit/scripts/clamp/script1.sh deleted file mode 100755 index 213a316c1..000000000 --- a/test/csit/scripts/clamp/script1.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property -# - -echo "This is ${WORKSPACE}/test/csit/scripts/clamp/script1.sh" diff --git a/test/csit/scripts/clamp/start_clamp_containers.sh b/test/csit/scripts/clamp/start_clamp_containers.sh new file mode 100755 index 000000000..143012f30 --- /dev/null +++ b/test/csit/scripts/clamp/start_clamp_containers.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# +# ============LICENSE_START======================================================= +# ONAP CLAMP +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END============================================ +# =================================================================== +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# + +echo "This is ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.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 + -- cgit 1.2.3-korg