Some Optimizations

- remove container and image without -f
- remove duplicated code from verify_storage.sh, replaced by
the script launch_containers_by_testsuite.sh
- move the common sentences from periodic.sh to
launch_containers_by_testsuite.sh
- add 'QTIP' as prompt for print messages

Change-Id: Ia9aa61a3b60c1049af3499a06f2c6cd0dc181552
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>

1 files changed, 2 insertions, 8 deletions

diff --git a/tests/ci/periodic.sh b/tests/ci/periodic.sh
index f208cdc6..5bbebb93 100755
--- a/tests/ci/periodic.sh
+++ b/tests/ci/periodic.sh
@@ -13,22 +13,16 @@ export DOCKER_TAG=${DOCKER_TAG:-latest}
 export ENV_FILE=$WORKSPACE/env_file
 QTIP_REPO=/home/opnfv/repos/qtip
 
-case $INSTALLER_TYPE in
-    apex)
-        INSTALLER_IP=`sudo virsh domifaddr undercloud | grep ipv4 | awk '{print $4}' | cut -d/ -f1`
-        ;;
-esac
-
 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)
 
 if [[ -z "$container_id" ]]; then
-    echo "The container opnfv/qtip has not been properly started. Exiting..."
+    echo "QTIP: The container opnfv/qtip has not been properly started. Exiting..."
     exit 1
 else
-    echo "The container ID is: ${container_id}"
+    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