X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fdeploy.sh;h=088f66eb2daff14a2486a0e67112e51a87d1bb57;hb=1dbe19bb4b9f951bf11a87940115aac4657a191f;hp=c53d5e9d6598f1f7ca45002ed1a27d999e579987;hpb=87a86dce0f8fefc57fd597cae8f63afdf3498512;p=demo.git

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index c53d5e9d..088f66eb 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -3,15 +3,26 @@
 set -x
 
 ########## Define parameters ##########
-VERSION="1.0.0"
+source ${WORKSPACE}"/version.properties"
+BRANCH=$(echo ${WORKSPACE} | cut -d'-' -f2)
+if [[ $BRANCH == "master" ]]
+then
+	VERSION=$snapshot_version
+else
+	VERSION=$release_version
+fi
 
-PATH_TO_BOOT="/w/workspace/demo-master-merge-java/boot"
-PATH_TO_HEAT="/w/workspace/demo-master-merge-java/heat"
-PATH_TO_HEAT_MASTER="/w/workspace/demo-master-merge-java/heat/OpenECOMP"
-PATH_TO_HEAT_VFW="/w/workspace/demo-master-merge-java/heat/vFW"
-PATH_TO_HEAT_VLB="/w/workspace/demo-master-merge-java/heat/vLB"
-PATH_TO_VFW="/w/workspace/demo-master-merge-java/vnfs/vFW/scripts"
-PATH_TO_VLB="/w/workspace/demo-master-merge-java/vnfs/vLB/scripts"
+echo "Workspace: " ${WORKSPACE}
+echo "Gerrit branch: " $BRANCH
+echo "Version number: " $VERSION
+
+PATH_TO_BOOT=${WORKSPACE}"/boot"
+PATH_TO_HEAT=${WORKSPACE}"/heat"
+PATH_TO_HEAT_MASTER=${WORKSPACE}"/heat/OpenECOMP"
+PATH_TO_HEAT_VFW=${WORKSPACE}"/heat/vFW"
+PATH_TO_HEAT_VLB=${WORKSPACE}"/heat/vLB"
+PATH_TO_VFW=${WORKSPACE}"/vnfs/vFW/scripts"
+PATH_TO_VLB=${WORKSPACE}"/vnfs/vLB/scripts"
 
 BOOT_GROUP_ID="org.openecomp.demo/boot"
 HEAT_GROUP_ID="org.openecomp.demo/heat"
@@ -33,8 +44,8 @@ cd $PATH_TO_BOOT
 ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{}
 
 cd $PATH_TO_HEAT
-curl -vk --netrc-file "${NETRC}" --upload-file README.md $REPO_URL/$HEAT_GROUP_ID/
-curl -vk --netrc-file "${NETRC}" --upload-file LICENSE.TXT $REPO_URL/$HEAT_GROUP_ID/
+curl -vk --netrc-file "${NETRC}" --upload-file $PATH_TO_HEAT/README.md $REPO_URL/$HEAT_GROUP_ID/
+curl -vk --netrc-file "${NETRC}" --upload-file $PATH_TO_HEAT/LICENSE.TXT $REPO_URL/$HEAT_GROUP_ID/
 
 cd $PATH_TO_HEAT_MASTER
 ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_MASTER_GROUP_ID/$VERSION/{}