engine: Include stack version in installer filename

[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 f1b58be8b511bdc025a16858f93156f345a0bfa2..b63a02449ba82b2489aead182dd273d7a1a52d1a 100755 (executable)
--- a/jjb/engine/scripts/upload-artifact.sh
+++ b/jjb/engine/scripts/upload-artifact.sh
@@ -22,41 +22,31 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-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"
+echo "Info  : Uploading $BUILD_ARTIFACTS 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"
-    ARTIFACT_MD5SUM=$(md5sum $ARTIFACT_TO_UPLOAD | cut -d' ' -f1)
-    ARTIFACT_SHASUM=$(shasum $ARTIFACT_TO_UPLOAD | cut -d' ' -f1)
-    ARTIFACT_SHA256SUM=$(sha256sum $ARTIFACT_TO_UPLOAD | cut -d' ' -f1)
+  for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
+    echo "Info  : Generating checksums for $BUILD_ARTIFACT"
+    ARTIFACT_MD5SUM=$(md5sum $BUILD_ARTIFACT | cut -d' ' -f1)
+    ARTIFACT_SHASUM=$(shasum $BUILD_ARTIFACT | cut -d' ' -f1)
+    ARTIFACT_SHA256SUM=$(sha256sum $BUILD_ARTIFACT | cut -d' ' -f1)
 
-    echo "Info  : Uploading $ARTIFACT_TO_UPLOAD to Nordix Artifactory"
+    # NOTE (fdegir): get rid of /tmp from BUILD_ARTIFACT
+    REMOTE_ARTIFACT=$(echo $BUILD_ARTIFACT | sed 's/.*\///g')
+
+    echo "Info  : Uploading $BUILD_ARTIFACT to Nordix Artifactory"
     curl -s -S \
         -H "X-JFrog-Art-Api:$NORDIX_ARM_TOKEN" \
         -H "X-Checksum-MD5:$ARTIFACT_MD5SUM" \
         -H "X-Checksum-Sha1:$ARTIFACT_SHASUM" \
         -H "X-Checksum-Sha256:$ARTIFACT_SHA256SUM" \
-        -T $ARTIFACT_TO_UPLOAD \
-        "$NORDIX_ARTIFACT_URL/$ARTIFACT_TO_UPLOAD"
-    echo "Info  : Artifact $ARTIFACT_TO_UPLOAD is available on $NORDIX_ARTIFACT_URL/$ARTIFACT_TO_UPLOAD"
+        -T $BUILD_ARTIFACT \
+        "$NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT"
+    echo "Info  : Artifact $BUILD_ARTIFACT is available on $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT"
   done
 else
   echo "Info  : Online deployment. No artifact to upload."
 fi
+
+# vim: set ts=2 sw=2 expandtab: