engine: Show error on curl upload/downloads

[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 b6602d39442fd3f1ab5b25413baecfb030cb9951..332ccfb78b7abf094913ea0288a4152f7337c627 100755 (executable)
--- a/jjb/engine/scripts/download-artifact.sh
+++ b/jjb/engine/scripts/download-artifact.sh
@@ -21,6 +21,20 @@
 set -o nounset
 set -o errexit
 
+if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then
+  export ARTIFACT_TO_DOWNLOAD="os-installer-ubuntu1804.bsx"
+  export NORDIX_ARM_REPO="nordix-openstack"
+else
+  export ARTIFACT_TO_DOWNLOAD="k8s-installer-ubuntu1804.bsx"
+  export NORDIX_ARM_REPO="nordix-kubernetes"
+fi
+
+if [[ "$CI_LOOP" == "periodic" ]]; then
+  export ARTIFACTS_TO_UPLOAD="$ARTIFACTS_TO_UPLOAD offline-package.tgz"
+else
+  export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/gerrit/$GERRIT_CHANGE_NUMBER"
+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 \
@@ -37,10 +51,14 @@ if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
 $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
+
   echo "Info  : Downloading artifact from Nordix ARM..."
   echo "        $NORDIX_ARTIFACT_URL/$ARTIFACT_TO_DOWNLOAD"
   cd /tmp
-  curl -s -O $NORDIX_ARTIFACT_URL/$ARTIFACT_TO_DOWNLOAD
+  curl -s -S -O $NORDIX_ARTIFACT_URL/$ARTIFACT_TO_DOWNLOAD
   echo "Info  : Downloaded the artifact for offline deployment. Extracting..."
   echo "        $(ls -al /tmp/$ARTIFACT_TO_DOWNLOAD)"
   chmod +x /tmp/$ARTIFACT_TO_DOWNLOAD