X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fshell%2Fmake-tar.sh;h=43e5693195984012a16e04103ba7698ebdd5fdef;hb=a32c0135e4a960a16eff2c6b87f8cae1ae68f973;hp=bd282d508fad9f63baacb512643147e64467e2a9;hpb=a8ee14ad90e77d1d6f32f07f2a58e6e01f6681ae;p=ci-management.git

diff --git a/jjb/shell/make-tar.sh b/jjb/shell/make-tar.sh
index bd282d5..43e5693 100644
--- a/jjb/shell/make-tar.sh
+++ b/jjb/shell/make-tar.sh
@@ -22,36 +22,46 @@ TARDIR=$UPLOAD_FILES_PATH
 
 set -e -u -x -o pipefail
 rm -fr "$TARDIR"
-mkdir "$TARDIR"
+
+if [ -n "$STAGING_BUILD" ]
+then
+    # Remove the "-SNAPSHOT" from the version for a staging build
+    VERSION=$(echo "$VERSION" | sed 's/-SNAPSHOT//')
+else
+    # Make sure the version has the "-SNAPSHOT" on the end for other builds
+    [[ ! "$VERSION" =~ -SNAPSHOT$ ]] && VERSION="${VERSION}-SNAPSHOT"
+fi
 
 if [ "$PROJECT" == "addon-onap" ]
 then
 
+    # Make sure $TARDIR is an absolute path
+    mkdir "$TARDIR"
+    [[ "$TARDIR" != /* ]] && TARDIR="$PWD/$TARDIR"
+
     # ONAP addon is special.
     # Build the regional controller scripts tar ball
     ARTIFACT_NAME="onap-amsterdam-regional-controller-${STREAM}"
-    TAR_NAME="${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz"
+    TAR_NAME="${ARTIFACT_NAME}-${VERSION}.tgz"
     echo "Making tar file ${TARDIR}/${TAR_NAME}"
     cd ./src/regional_controller_scripts/
     tar -cvzf "${TARDIR}/${TAR_NAME}" -- *
 
     # Build the ONAP VM scripts tar ball
     ARTIFACT_NAME="onap-amsterdam-VM-${STREAM}"
-    TAR_NAME="${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz"
+    TAR_NAME="${ARTIFACT_NAME}-${VERSION}.tgz"
     echo "Making tar file ${TARDIR}/${TAR_NAME}"
     cd ../onap_vm_scripts/
     tar -cvzf "${TARDIR}/${TAR_NAME}" -- *
 
 else
 
-    if [ "$STREAM" == "master" ]
-    then
-        TAR_NAME="${PROJECT}-${VERSION}-SNAPSHOT.tgz"
-    else
-        TAR_NAME="${PROJECT}-${VERSION}-${STREAM}-SNAPSHOT.tgz"
-    fi
+    TAR_NAME="${PROJECT}-${VERSION}.tgz"
     echo "Making tar file ${TARDIR}/${TAR_NAME}"
-    tar -cvzf "${TARDIR}/${TAR_NAME}" -- *
+    # Put the file in /tmp initially to prevent it $TARDIR from going into the tar file
+    tar -cvzf "/tmp/${TAR_NAME}" -- *
+    mkdir "$TARDIR"
+    cp "/tmp/${TAR_NAME}" "${TARDIR}/${TAR_NAME}"
 
 fi
 set +u +x