From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Thu, 29 Oct 2015 10:54:13 +0000 (+0100)
Subject: Functest job remove container fixed
X-Git-Tag: test-tag~233
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8f745b59bafb4073945834236157756bcbcea135;p=releng.git

Functest job remove container fixed

JIRA: FUNCTEST-85

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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 92afa7d0f..e300dd11e 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -646,7 +646,8 @@
             set +e
 
             # cleanup: remove any docker containers leftovers
-            docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null
-            docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null
-            docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null
+            echo "Removing the docker container..."
+            docker rm -f $(docker ps | grep opnfv/functest | awk '{print $1}')
+            echo "Removing the docker image..."
+            docker rmi -f $(docker images | grep opnfv/functest | awk '{print $3}')