Adapt engine-verify jobs for engine refactoring

[infra/cicd.git] / jjb / engine / scripts / download-artifact.sh

diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh
index 3c559baeeb2dad972c081ffd36ae5d33789f7bb3..2257c011e874b3285685ae84e73eebd3e16d8c25 100755 (executable)
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -23,29 +23,24 @@ 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/$INSTALLER_FILE ~/.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"
-  sudo bash -c "cat << EOF >> /etc/hosts
-# managed by engine
-$NORDIX_ARM_PUBLIC_IP artifactory.nordix.org
-# managed by engine
-EOF"
   echo "Info  : Downloading artifact from Nordix ARM..."
-  echo "        $NORDIX_ARTIFACT_URL/$ARTIFACT_TO_DOWNLOAD"
+  echo "        $NORDIX_ARTIFACT_URL/$INSTALLER_FILE"
   cd /tmp
-  curl -s -O $NORDIX_ARTIFACT_URL/$ARTIFACT_TO_DOWNLOAD
+  curl -s -S -O $NORDIX_ARTIFACT_URL/$INSTALLER_FILE
   echo "Info  : Downloaded the artifact for offline deployment. Extracting..."
-  echo "        $(ls -al /tmp/$ARTIFACT_TO_DOWNLOAD)"
-  chmod +x /tmp/$ARTIFACT_TO_DOWNLOAD
-  /tmp/$ARTIFACT_TO_DOWNLOAD
-  sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD
+  echo "        $(ls -al /tmp/$INSTALLER_FILE)"
+  chmod +x /tmp/$INSTALLER_FILE
+  /tmp/$INSTALLER_FILE
+  sudo /bin/rm -rf /tmp/$INSTALLER_FILE
 else
   echo "Info  : Online deployment. Skipping artifact download."
 fi
+
+# vim: set ts=2 sw=2 expandtab: