X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fshell%2Fmake-tar.sh;h=76d730dca4b7919b8ce3faafaca2db4c5e03d7b3;hb=7af6784df0f28e49e9b7b089c7bd1f4edc324dec;hp=68951af89ff0bc16dfce5cad62df40489479d6a2;hpb=7788160368ef651c048aabfebebf125ddf22235b;p=ci-management.git

diff --git a/jjb/shell/make-tar.sh b/jjb/shell/make-tar.sh
index 68951af..76d730d 100644
--- a/jjb/shell/make-tar.sh
+++ b/jjb/shell/make-tar.sh
@@ -14,34 +14,46 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+sudo yum install -y dos2unix
 # shellcheck source="$WORKSPACE/version.properties" disable=SC1091
 dos2unix "${WORKSPACE}/version.properties"
 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"
 
+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
 
     # 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}${VERSION}-SNAPSHOT.tgz"
+    ARTIFACT_NAME="onap-amsterdam-regional-controller-${STREAM}"
+    TAR_NAME="${ARTIFACT_NAME}-${VERSION}.tgz"
+    echo "Making tar file ${TARDIR}/${TAR_NAME}"
     cd ./src/regional_controller_scripts/
-    tar -cvzf "${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" -- *
+    tar -cvzf "${TARDIR}/${TAR_NAME}" -- *
 
     # Build the ONAP VM scripts tar ball
-    ARTIFACT_NAME="onap-amsterdam-VM-master"
-    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz"
+    ARTIFACT_NAME="onap-amsterdam-VM-${STREAM}"
+    TAR_NAME="${ARTIFACT_NAME}-${VERSION}.tgz"
+    echo "Making tar file ${TARDIR}/${TAR_NAME}"
     cd ../onap_vm_scripts/
-    tar -cvzf "${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" -- *
+    tar -cvzf "${TARDIR}/${TAR_NAME}" -- *
 
 else
 
+    TAR_NAME="${PROJECT}-${VERSION}.tgz"
     echo "Making tar file ${TARDIR}/${TAR_NAME}"
     tar -cvzf "${TARDIR}/${TAR_NAME}" -- *