X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fshell%2Fmake-tar.sh;h=79e7e6d375afef55eaab9b0163afdc55c59a4368;hb=d4e2961f7e52af1ad5bff7fb8e87423412d1f1c5;hp=0e8aae0e401342ea0da3a480d322ebfd0611a680;hpb=9eed514f9bcef08aa7ae65ab6cd64cb2aeea9e6c;p=ci-management.git

diff --git a/jjb/shell/make-tar.sh b/jjb/shell/make-tar.sh
index 0e8aae0..79e7e6d 100644
--- a/jjb/shell/make-tar.sh
+++ b/jjb/shell/make-tar.sh
@@ -14,9 +14,10 @@
 # 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
@@ -28,19 +29,23 @@ 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"
+    # 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}"
     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}-SNAPSHOT.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}" -- *