Merge "Skip container and docker image clean up"

2 files changed, 8 insertions, 27 deletions

diff --git a/tests/ci/launch_containers_by_testsuite.sh b/tests/ci/launch_containers_by_testsuite.sh
index c291a799..b55ba09c 100755
--- a/tests/ci/launch_containers_by_testsuite.sh
+++ b/tests/ci/launch_containers_by_testsuite.sh
@@ -29,18 +29,6 @@ if [[ "$TEST_SUITE" == 'compute' ]];then
     cat $ENV_FILE
     echo "--------------------------------------------------------"
 
-    if [[ ! -z $(docker ps -a | grep "opnfv/qtip:$DOCKER_TAG") ]]; then
-        echo "QTIP: Removing existing opnfv/qtip containers..."
-        container_id=$(docker ps -a | grep "opnfv/qtip:$DOCKER_TAG" | awk '{print $1}')
-        docker stop $container_id
-        docker rm $container_id
-    fi
-
-    if [[ $(docker images opnfv/qtip:${DOCKER_TAG} | wc -l) -gt 1 ]]; then
-        echo "QTIP: Removing docker image opnfv/qtip:$DOCKER_TAG..."
-        docker rmi opnfv/qtip:$DOCKER_TAG
-    fi
-
     echo "Qtip: Pulling docker image: opnfv/qtip:${DOCKER_TAG}"
     docker pull opnfv/qtip:$DOCKER_TAG >/dev/null
 
@@ -49,7 +37,14 @@ if [[ "$TEST_SUITE" == 'compute' ]];then
     if [[ "$INSTALLER_TYPE" == "apex" ]];then     vols="-v /root/.ssh:/root/.ssh"
     fi
 
-    cmd="sudo docker run -id ${envs} ${vols} opnfv/qtip:${DOCKER_TAG} /bin/bash"
+    container_name="qtip-${TEST_SUITE}"
+    if [[ -n $(docker ps -a|grep ${container_name}) ]]; then
+        echo "QTIP: cleaning existing container"
+        docker stop ${container_name}
+        docker rm ${container_name}
+    fi
+
+    cmd="sudo docker run -id --name ${container_name} ${envs} ${vols} opnfv/qtip:${DOCKER_TAG} /bin/bash"
     echo "Qtip: Running docker command: ${cmd}"
     ${cmd}
 
diff --git a/tests/ci/storperf/containers.sh b/tests/ci/storperf/containers.sh
index 02a947da..26d582bf 100755
--- a/tests/ci/storperf/containers.sh
+++ b/tests/ci/storperf/containers.sh
@@ -11,20 +11,6 @@ clean_containers()
 {
     echo "QTIP: Cleanup existing qtip and storperf containers"
     docker-compose -f qtip-storperf-docker-compose.yaml down
-
-    for name in qtip storperf-master storperf-swaggerui storperf-httpfrontend storperf-reporting
-    do
-        container=$(docker ps -a | grep "opnfv/${name}：${DOCKER_TAG}" | awk '{print $1}')
-        if [[ ! -z "$container" ]]; then
-            echo "QTIP: Removing any existing $name container"
-            docker rm -v $container
-        fi
-
-        if [[ $(docker images opnfv/${name}:${DOCKER_TAG} | wc -l) -gt 1 ]]; then
-            echo "QTIP: Removing docker image opnfv/$name :$DOCKER_TAG..."
-            docker rmi opnfv/${name}:${DOCKER_TAG}
-        fi
-    done
 }