X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fdeploy.sh;h=67da5fc1d95cedd6e5c942a913fb04cac58b88ab;hb=refs%2Fheads%2Fbeijing;hp=3cfe1945c54784f9075703ad80d7f4ef40f12dca;hpb=a7417591cd3a600bbbb4fbbc6e30c376ea9b6218;p=demo.git

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 3cfe1945..67da5fc1 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,36 +1,78 @@
 #!/bin/bash
 
+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
+
+echo "Workspace: " ${WORKSPACE}
+echo "Gerrit branch: " $BRANCH
+echo "Version number: " $VERSION
 
-PATH_TO_BOOT="../boot"
-PATH_TO_HEAT="../heat"
-PATH_TO_VFW="../vnfs/vFW/scripts"
-PATH_TO_VLB="../vnfs/vLB/scripts"
+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_VLBMS=${WORKSPACE}"/vnfs/vLBMS/scripts"
+PATH_TO_VCPE=${WORKSPACE}"/vnfs/vCPE/scripts"
 
-BOOT_GROUP_ID="org.openecomp.demo.boot"
-HEAT_GROUP_ID="org.openecomp.demo.heat"
-VFW_GROUP_ID="org.openecomp.demo.vnfs.vfw"
-VLB_GROUP_ID="org.openecomp.demo.vnfs.vlb"
+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"
+VLBMS_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlbms"
+VCPE_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vcpe"
 
-#NEXUSPROXY=https://nexus.openecomp.org
-REPO_URL="${NEXUSPROXY}/content/sites/raw"
+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 -k --netrc-file '${NETRC}' --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{}
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{}
+
+#cd $PATH_TO_HEAT_MASTER
+#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_MASTER_GROUP_ID/$VERSION/{}
 
-cd $PATH_TO_HEAT
-ls | xargs -I{} curl -k --netrc-file '${NETRC}' --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{}
+#cd $PATH_TO_HEAT_VFW
+#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_VFW_GROUP_ID/$VERSION/{}
+
+#cd $PATH_TO_HEAT_VLB
+#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_VLB_GROUP_ID/$VERSION/{}
 
 cd $PATH_TO_VFW
-ls | xargs -I{} curl -k --netrc-file '${NETRC}' --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{}
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{}
 
 cd $PATH_TO_VLB
-ls | xargs -I{} curl -k --netrc-file '${NETRC}' --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
+
+cd $PATH_TO_VLBMS
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLBMS_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 ##########
+rm ${NETRC}
+##############################