summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/apex.yml1
-rw-r--r--jjb/functest/functest.yml7
2 files changed, 4 insertions, 4 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 38934786b..30dfcda0c 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -189,7 +189,6 @@
builders:
- 'apex-build'
- 'apex-upload-artifact'
- - 'apex-workspace-cleanup'
- 'apex-deploy-virtual'
- 'apex-workspace-cleanup'
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}')