From: re2429 <re2429@att.com>
Date: Thu, 13 Sep 2018 17:38:32 +0000 (-0400)
Subject: Fixed incorrect naming of tar files
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=d4e2961f7e52af1ad5bff7fb8e87423412d1f1c5;p=ci-management.git

Fixed incorrect naming of tar files

Change-Id: Ib00c8f189f609abd35188c1bf504c68296f19cf6
Signed-off-by: re2429 <re2429@att.com>
---

diff --git a/jjb/shell/make-tar.sh b/jjb/shell/make-tar.sh
index bd282d5..79e7e6d 100644
--- a/jjb/shell/make-tar.sh
+++ b/jjb/shell/make-tar.sh
@@ -29,6 +29,7 @@ then
 
     # ONAP addon is special.
     # Build the regional controller scripts tar ball
+    # NOTE: Remove the two "-SNAPSHOT" below when the ONAP version.properties is fixed.
     ARTIFACT_NAME="onap-amsterdam-regional-controller-${STREAM}"
     TAR_NAME="${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz"
     echo "Making tar file ${TARDIR}/${TAR_NAME}"
@@ -44,12 +45,7 @@ then
 
 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}" -- *