Merge "Revert "Revert "GEODE: Update branch to: release-nordix/1.12.0"""

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

diff --git a/jjb/engine/scripts/upload-artifact.sh b/jjb/engine/scripts/upload-artifact.sh
index 79ba0a9d4e88cf9463b51c42409237e8cee7a408..f1b58be8b511bdc025a16858f93156f345a0bfa2 100755 (executable)
--- a/jjb/engine/scripts/upload-artifact.sh
+++ b/jjb/engine/scripts/upload-artifact.sh
@@ -22,7 +22,24 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
+if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then
+  export ARTIFACTS_TO_UPLOAD="os-installer-ubuntu1804.bsx"
+  export NORDIX_ARM_REPO="nordix-openstack"
+else
+  export ARTIFACTS_TO_UPLOAD="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
+
+echo "Info  : Uploading $ARTIFACTS_TO_UPLOAD to Nordix ARM $NORDIX_ARM_REPO repository"
+
+if [[ "$EXECUTION_MODE" == "packaging" || "$EXECUTION_MODE" == "offline-deployment" ]]; then
   cd /tmp
   for ARTIFACT_TO_UPLOAD in $ARTIFACTS_TO_UPLOAD; do
     echo "Info  : Generating checksums for $ARTIFACT_TO_UPLOAD"
@@ -31,7 +48,7 @@ if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
     ARTIFACT_SHA256SUM=$(sha256sum $ARTIFACT_TO_UPLOAD | cut -d' ' -f1)
 
     echo "Info  : Uploading $ARTIFACT_TO_UPLOAD to Nordix Artifactory"
-    curl -s \
+    curl -s -S \
         -H "X-JFrog-Art-Api:$NORDIX_ARM_TOKEN" \
         -H "X-Checksum-MD5:$ARTIFACT_MD5SUM" \
         -H "X-Checksum-Sha1:$ARTIFACT_SHASUM" \