X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fscripts%2Fdownload-artifact.sh;h=b6602d39442fd3f1ab5b25413baecfb030cb9951;hb=654b73057832a9e83c7a3cca98066fcfc88202ef;hp=3c559baeeb2dad972c081ffd36ae5d33789f7bb3;hpb=a57813cc79bd640dbbe984ba62dd9ff67c3b1f28;p=infra%2Fcicd.git

diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh
index 3c559bae..b6602d39 100755
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -23,12 +23,12 @@ set -o errexit
 
 if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
   # ensure we delete leftovers due to lack of disk space
-  sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD \
-      /opt/engine /opt/test /opt/stack /httpboot || true
-  sudo docker ps -a | grep -v CONTAINER | awk '{print $1}' | xargs -n 1 sudo docker stop || true
-  sudo docker ps -a | grep -v CONTAINER | awk '{print $1}' | xargs -n 1 sudo docker rm || true
-  sudo docker images -a | grep -v CONTAINER | awk '{print $1":"$2}' | \
-      xargs -n 1 sudo docker rmi -f || true
+  sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD ~/.ara \
+      /opt/engine /opt/test /opt/stack /httpboot > /dev/null 2>&1 || true
+  sudo docker ps -a --format {{.ID}} | xargs -n 1 sudo docker stop > /dev/null 2>&1 || true
+  sudo docker ps -a --format {{.ID}} | xargs -n 1 sudo docker rm > /dev/null 2>&1 || true
+  sudo docker images -a --format {{.ID}} | xargs -n 1 sudo docker rmi -f > /dev/null 2>&1 || true
+  sudo docker volume rm $(sudo docker volume ls -qf dangling=true) > /dev/null 2>&1 || true
 
   # offline nodes can't resolve artifactory.nordix.org
   echo "Info  : Offline deployment. Adding Nordix ARM Public IP to /etc/hosts"