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

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index c53d5e9d..f20f9845 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -3,39 +3,52 @@
 set -x
 
 ########## Define parameters ##########
-VERSION="1.0.0"
-
-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"
-
-BOOT_GROUP_ID="org.openecomp.demo/boot"
-HEAT_GROUP_ID="org.openecomp.demo/heat"
-HEAT_MASTER_GROUP_ID="org.openecomp.demo/heat/OpenECOMP"
-HEAT_VFW_GROUP_ID="org.openecomp.demo/heat/vFW"
-HEAT_VLB_GROUP_ID="org.openecomp.demo/heat/vLB"
-VFW_GROUP_ID="org.openecomp.demo/vnfs/vfw"
-VLB_GROUP_ID="org.openecomp.demo/vnfs/vlb"
-
-REPO_URL="https://nexus.openecomp.org/content/sites/raw"
+source ${WORKSPACE}"/version.properties"
+BRANCH=$(echo ${WORKSPACE} | cut -d'-' -f2)
+if [[ $BRANCH == "master" ]]
+then
+	VERSION=$snapshot_version
+else
+	VERSION=$release_version
+fi
+
+echo "Workspace: " ${WORKSPACE}
+echo "Gerrit branch: " $BRANCH
+echo "Version number: " $VERSION
+
+PATH_TO_PARENT=${WORKSPACE}
+PATH_TO_BOOT=${WORKSPACE}"/boot"
+PATH_TO_HEAT_MASTER=${WORKSPACE}"/heat/ONAP"
+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"
+PATH_TO_VCPE=${WORKSPACE}"/vnfs/vCPE/scripts"
+
+PARENT_GROUP_ID="org.onap.demo"
+BOOT_GROUP_ID=$PARENT_GROUP_ID"/boot"
+HEAT_MASTER_GROUP_ID=$PARENT_GROUP_ID"/heat/ONAP"
+HEAT_VFW_GROUP_ID=$PARENT_GROUP_ID"/heat/vFW"
+HEAT_VLB_GROUP_ID=$PARENT_GROUP_ID"/heat/vLB"
+VFW_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vfw"
+VLB_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlb"
+VCPE_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vcpe"
+
+REPO_URL="https://nexus.onap.org/content/sites/raw"
 USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
 PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
 NETRC=$(mktemp)
-echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}"
-#######################################
+echo "machine nexus.onap.org login ${USER} password ${PASS}" > "${NETRC}"
+####################################################
 
 ##### Upload scripts into Nexus raw repository #####
+cd $PATH_TO_PARENT
+curl -vk --netrc-file "${NETRC}" --upload-file README.md $REPO_URL/$PARENT_GROUP_ID/
+curl -vk --netrc-file "${NETRC}" --upload-file LICENSE.TXT $REPO_URL/$PARENT_GROUP_ID/
+
 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/
-
 cd $PATH_TO_HEAT_MASTER
 ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_MASTER_GROUP_ID/$VERSION/{}
 
@@ -50,6 +63,9 @@ ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW
 
 cd $PATH_TO_VLB
 ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
+
+cd $PATH_TO_VCPE
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VCPE_GROUP_ID/$VERSION/{}
 ####################################################
 
 ########## Clean up ##########