engine: Include stack version in installer filename

[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 68e8d03998a6d17f1388708c7933d34bdb5ba4de..9b3aebf5c2e5e9ca9af15548f93a2aa60bd27482 100755 (executable)
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -23,22 +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/$INSTALLER_FILE ~/.ara \
+  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')
+
   echo "Info  : Downloading artifact from Nordix ARM..."
-  echo "        $NORDIX_ARTIFACT_URL/$INSTALLER_FILE"
+  echo "        $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT"
   cd /tmp
-  curl -s -S -O $NORDIX_ARTIFACT_URL/$INSTALLER_FILE
+  curl -s -S -O $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT
   echo "Info  : Downloaded the artifact for offline deployment. Extracting..."
-  echo "        $(ls -al /tmp/$INSTALLER_FILE)"
-  chmod +x /tmp/$INSTALLER_FILE
-  /tmp/$INSTALLER_FILE
-  sudo /bin/rm -rf /tmp/$INSTALLER_FILE
+  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