engine: Remove outdated files and containers

Baremetal jumphosts have limited disk so stuff that is not needed
for certain jobs will be removed to open up space.

Change-Id: I1c38e857d617041bfcf94272da105c3913ca0243

diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh
index 3c559baeeb2dad972c081ffd36ae5d33789f7bb3..b6602d39442fd3f1ab5b25413baecfb030cb9951 100755 (executable)
--- 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"

diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh
index 654c419d06ee32646fa75f6349df98a916ddc858..8799ce931439ec74c2c6052581369a2a86eb28c7 100755 (executable)
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -28,11 +28,10 @@ if [[ "$EXECUTION_MODE" == "offline-deployment" && "$SLAVE_LABEL" != "baremetal-
 fi
 
 # NOTE (fdegir): delete unnecessary stuff to free up space on baremetal jumphost
-sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD \
-    /opt/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/containers
-    /opt/engine/offline/dib /opt/engine/offline/pkg
-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/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/containers \
+    /opt/engine/offline/dib /opt/engine/offline/pkg /tmp/kubespray_cache > /dev/null 2>&1 || true
+sudo docker images -a --format {{.ID}} | xargs -n 1 sudo docker rmi -f > /dev/null 2>&1 || true
 
 echo "Info  : Cloning infra/test repository"
 cd $HOME && /bin/rm -rf $WORKSPACE

diff --git a/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml b/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
index cbcde2ac470dbe65e0e14387deaad77c9e164e4d..3121a3d6f58e95ca5656bb9156e0f246236bbc4d 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
@@ -86,7 +86,7 @@
           description: 'Verbosity setting for the engine - true or false - default is false'
       - string:
           name: ARTIFACTS_TO_UPLOAD
-          default: '"k8s-installer-ubuntu1804.bsx"'
+          default: "k8s-installer-ubuntu1804.bsx"
           description: 'Artifacts to upload'
       - string:
           name: ARTIFACT_TO_DOWNLOAD