X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fscripts%2Fdownload-artifact.sh;h=9b3aebf5c2e5e9ca9af15548f93a2aa60bd27482;hb=refs%2Fchanges%2F84%2F5384%2F1;hp=3c559baeeb2dad972c081ffd36ae5d33789f7bb3;hpb=299841ac0e55baa3f49aab1e0e55d353fe1d75ca;p=infra%2Fcicd.git

diff --git a/jjb/engine/scripts/download-artifact.sh b/jjb/engine/scripts/download-artifact.sh
index 3c559bae..9b3aebf5 100755
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -23,29 +23,26 @@ 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 $OFFLINE_INSTALLER_FILE ~/.ara \
+      /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
+
+  REMOTE_ARTIFACT=$(echo $OFFLINE_INSTALLER_FILE | sed 's/.*\///g')
 
-  # 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/$REMOTE_ARTIFACT"
   cd /tmp
-  curl -s -O $NORDIX_ARTIFACT_URL/$ARTIFACT_TO_DOWNLOAD
+  curl -s -S -O $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT
   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 $OFFLINE_INSTALLER_FILE)"
+  chmod +x $OFFLINE_INSTALLER_FILE
+  $OFFLINE_INSTALLER_FILE
+  sudo /bin/rm -rf $OFFLINE_INSTALLER_FILE
 else
   echo "Info  : Online deployment. Skipping artifact download."
 fi
+
+# vim: set ts=2 sw=2 expandtab: