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 c1bf97ed01640e62cff5ac6763053d7bd7029a49..9b3aebf5c2e5e9ca9af15548f93a2aa60bd27482 100755 (executable)
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -21,40 +21,28 @@
 set -o nounset
 set -o errexit
 
-if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then
-  echo "Info  : Artifact download is not enabled for $GERRIT_PROJECT repository"
-  exit 0
-fi
-
 if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
   # ensure we delete leftovers due to lack of disk space
-  sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD ~/.ara \
-      /opt/engine /opt/test /opt/stack /httpboot > /dev/null 2>&1 || 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
 
-  # 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"
-
-  # we need to get rid of search domain as well
-  sudo sed -i 's/^search/# search/' /etc/resolv.conf
+  REMOTE_ARTIFACT=$(echo $OFFLINE_INSTALLER_FILE | sed 's/.*\///g')
 
   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: