From 2d3d8dcf6ef1bd2a161c69d561c629c5ec3f59c4 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 27 Sep 2018 10:29:30 -0700 Subject: Move CSIT to integration/csit repo To facilite branching of CSIT tests, all CSIT test code and scripts are relocated to the integration/csit repo. Change-Id: I6777cd414e43dbf2bfa6215f7e50849e1a6a2e59 Issue-ID: INT-671 Signed-off-by: Gary Wu --- test/csit/scripts/vid/clone_and_setup_vid_data.sh | 37 ---------------- .../vid/kill_containers_and_remove_dataFolders.sh | 31 ------------- test/csit/scripts/vid/start_vid_containers.sh | 51 ---------------------- 3 files changed, 119 deletions(-) delete mode 100644 test/csit/scripts/vid/clone_and_setup_vid_data.sh delete mode 100644 test/csit/scripts/vid/kill_containers_and_remove_dataFolders.sh delete mode 100644 test/csit/scripts/vid/start_vid_containers.sh (limited to 'test/csit/scripts/vid') diff --git a/test/csit/scripts/vid/clone_and_setup_vid_data.sh b/test/csit/scripts/vid/clone_and_setup_vid_data.sh deleted file mode 100644 index 917016c7a..000000000 --- a/test/csit/scripts/vid/clone_and_setup_vid_data.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/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/sdc/clone_and_setup_vid_data.sh" - -# Clone sdc enviroment template - -mkdir -p ${WORKSPACE}/data/clone/ - -cd ${WORKSPACE}/data/clone -git clone --depth 1 http://gerrit.onap.org/r/vid -b master - - - - - diff --git a/test/csit/scripts/vid/kill_containers_and_remove_dataFolders.sh b/test/csit/scripts/vid/kill_containers_and_remove_dataFolders.sh deleted file mode 100644 index 33a799d50..000000000 --- a/test/csit/scripts/vid/kill_containers_and_remove_dataFolders.sh +++ /dev/null @@ -1,31 +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/vid/kill_and_remove_dataFolder.sh" - -#kill and remove all vid dockers -docker stop $(docker ps -a -q --filter="name=vid") -docker rm $(docker ps -a -q --filter="name=vid") - - -#delete data folder - -rm -rf ${WORKSPACE}/data/* - - diff --git a/test/csit/scripts/vid/start_vid_containers.sh b/test/csit/scripts/vid/start_vid_containers.sh deleted file mode 100644 index c4bdae2de..000000000 --- a/test/csit/scripts/vid/start_vid_containers.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/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/vid/start_vid_containers.sh" - -export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` - -cd ${WORKSPACE}/test/csit/tests/vid/resources -docker-compose up -d --build - -# WAIT 5 minutes maximum and test every 5 seconds if VID up using HealthCheck API - -TIME_OUT=1200 -INTERVAL=5 -TIME=0 -while [ "$TIME" -lt "$TIME_OUT" ]; do - response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/vid/healthCheck); echo $response - - if [ "$response" == "200" ]; then - echo VID and its database well started in $TIME seconds - break; - fi - - echo Sleep: $INTERVAL seconds before testing if VID 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