From 9eed514f9bcef08aa7ae65ab6cd64cb2aeea9e6c Mon Sep 17 00:00:00 2001
From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Fri, 27 Jul 2018 15:15:27 -0700
Subject: [PATCH] Fix upload issues with Nexus

Nexus requires that artifacts going into SNAPSHOT repositories have a
version as well as end in -SNAPSHOT

Change-Id: I20ad4efa13495a69cc821d43947f0517e5eda65d
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---
 jjb/shell/make-tar.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/jjb/shell/make-tar.sh b/jjb/shell/make-tar.sh
index 6d36f0a..0e8aae0 100644
--- a/jjb/shell/make-tar.sh
+++ b/jjb/shell/make-tar.sh
@@ -14,13 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source $WORKSPACE/version.properties
-TAR_NAME="${PROJECT}-${VERSION}.tgz"
+# shellcheck source="$WORKSPACE/version.properties" disable=SC1091
+source "$WORKSPACE/version.properties"
+TAR_NAME="${PROJECT}-${VERSION}-SNAPSHOT.tgz"
 TARDIR=$UPLOAD_FILES_PATH
 
 set -e -u -x -o pipefail
-rm -fr $TARDIR
-mkdir $TARDIR
+rm -fr "$TARDIR"
+mkdir "$TARDIR"
 
 if [ "$PROJECT" == "addon-onap" ]
 then
@@ -28,20 +29,20 @@ then
     # ONAP addon is special.
     # Build the regional controller scripts tar ball
     ARTIFACT_NAME="onap-amsterdam-regional-controller-master"
-    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}.tgz"
+    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}${VERSION}-SNAPSHOT.tgz"
     cd ./src/regional_controller_scripts/
-    tar -cvzf ${TARDIR}/${ARTIFACT_NAME}.tgz *
+    tar -cvzf "${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" -- *
 
     # Build the ONAP VM scripts tar ball
     ARTIFACT_NAME="onap-amsterdam-VM-master"
-    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}.tgz"
+    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz"
     cd ../onap_vm_scripts/
-    tar -cvzf ${TARDIR}/${ARTIFACT_NAME}.tgz *
+    tar -cvzf "${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" -- *
 
 else
 
     echo "Making tar file ${TARDIR}/${TAR_NAME}"
-    tar -cvzf ${TARDIR}/${TAR_NAME} *
+    tar -cvzf "${TARDIR}/${TAR_NAME}" -- *
 
 fi
-set +u +x
\ No newline at end of file
+set +u +x
-- 
2.16.6