Add a more consistent method of cleanup docker Functest jjob

Change-Id: Ie561c21a104d01c015ae2d513c1d512650b87982
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

1 files changed, 20 insertions, 5 deletions

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 23ff232b3..cb72fc74b 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -644,8 +644,23 @@
         - shell: |
             #!/bin/bash
 
-            # cleanup: remove any docker containers leftovers
-            echo "Removing existing Functest Docker containers..."
-            docker rm -f $(docker ps | grep opnfv/functest | awk '{print $1}')
-            echo "Removing existing Functest Docker image..."
-            docker rmi -f $(docker images | grep opnfv/functest | awk '{print $3}')
+            echo "Cleaning up docker containers/images..."
+
+            # Remove previous running containers if exist
+            if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
+                echo "Removing existing opnfv/functest containers..."
+                docker ps | grep opnfv/functest | awk '{{print $1}}' | xargs docker stop
+                docker ps -a | grep opnfv/functest | awk '{{print $1}}' | xargs docker rm
+            fi
+
+
+            # Remove existing images if exist
+            if [[ ! -z $(docker images | grep opnfv/functest) ]]; then
+                echo "Docker images to remove:"
+                docker images | head -1 && docker images | grep opnfv/functest
+                image_tags=($(docker images | grep opnfv/functest | awk '{{print $2}}'))
+                for tag in "${{image_tags[@]}}"; do
+                    echo "Removing docker image opnfv/functest:$tag..."
+                    docker rmi opnfv/functest:$tag
+                done
+            fi