From 2bf95e68a19fc3a7c1e3236a977b1d3b6db1c05c Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Fri, 8 Sep 2017 17:08:59 +0800
Subject: Refactor CI scripts

- Move scripts executed inside container to qtip/scripts
- tests/ci is limited to setup the environment and start services

Change-Id: I454c715890601c6c6472006c2f0f6131695c2f51
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 tests/ci/periodic.sh | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'tests/ci/periodic.sh')

diff --git a/tests/ci/periodic.sh b/tests/ci/periodic.sh
index 5bbebb93..a0054fec 100755
--- a/tests/ci/periodic.sh
+++ b/tests/ci/periodic.sh
@@ -9,22 +9,12 @@
 set -e
 set -x
 
-export DOCKER_TAG=${DOCKER_TAG:-latest}
-export ENV_FILE=$WORKSPACE/env_file
-QTIP_REPO=/home/opnfv/repos/qtip
-
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $script_dir/launch_containers_by_testsuite.sh
 
-container_id=$(docker ps | grep "opnfv/qtip:${DOCKER_TAG}" | awk '{print $1}' | head -1)
+source ${script_dir}/utils/start_services.sh
 
-if [[ -z "$container_id" ]]; then
-    echo "QTIP: The container opnfv/qtip has not been properly started. Exiting..."
-    exit 1
-else
-    echo "QTIP: The container ID is: ${container_id}"
-    docker exec -t ${container_id} bash -c "bash ${QTIP_REPO}/tests/ci/run_${TEST_SUITE}_qpi.sh"
-fi
+docker exec -t ${TEST_SUITE}_qtip bash -x ${qtip_repo}/qtip/scripts/quickstart.sh
 
 echo "${TEST_SUITE} QPI done!"
-exit 0
\ No newline at end of file
+
+exit 0
-- 
cgit 1.2.3-korg