diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-09-15 05:48:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-15 05:48:16 +0000 |
commit | 35710f44ea46f07471ff8636fa4a2b8f8de56632 (patch) | |
tree | 58877a8a5b0a7b8d9b44d0ad9a0b6b28dc518e71 /tests/ci/periodic.sh | |
parent | b2336bd1742797e0f38063f654646f115dd62e45 (diff) | |
parent | 2bf95e68a19fc3a7c1e3236a977b1d3b6db1c05c (diff) |
Merge "Refactor CI scripts"
Diffstat (limited to 'tests/ci/periodic.sh')
-rwxr-xr-x | tests/ci/periodic.sh | 18 |
1 files changed, 4 insertions, 14 deletions
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 |