Fixed CDR_IMAGE_VERSION in portal script

[demo.git] / scripts / deploy.sh

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 3b9f449..67da5fc 100755 (executable)
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -18,26 +18,30 @@ echo "Version number: " $VERSION
 
 PATH_TO_PARENT=${WORKSPACE}
 PATH_TO_BOOT=${WORKSPACE}"/boot"
-PATH_TO_HEAT_MASTER=${WORKSPACE}"/heat/OpenECOMP"
-PATH_TO_HEAT_VFW=${WORKSPACE}"/heat/vFW"
-PATH_TO_HEAT_VLB=${WORKSPACE}"/heat/vLB"
+#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"
 
-PARENT_GROUP_ID="org.openecomp.demo"
+PARENT_GROUP_ID="org.onap.demo"
 BOOT_GROUP_ID=$PARENT_GROUP_ID"/boot"
-HEAT_MASTER_GROUP_ID=$PARENT_GROUP_ID"/heat/OpenECOMP"
-HEAT_VFW_GROUP_ID=$PARENT_GROUP_ID"/heat/vFW"
-HEAT_VLB_GROUP_ID=$PARENT_GROUP_ID"/heat/vLB"
+#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"
 
 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.onap.org login ${USER} password ${PASS}" > "${NETRC}"
-#######################################
+####################################################
 
 ##### Upload scripts into Nexus raw repository #####
 cd $PATH_TO_PARENT
@@ -47,20 +51,26 @@ curl -vk --netrc-file "${NETRC}" --upload-file LICENSE.TXT $REPO_URL/$PARENT_GRO
 cd $PATH_TO_BOOT
 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_MASTER
+#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_MASTER_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_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_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 -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{}
 
 cd $PATH_TO_VLB
 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 ##########