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

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 088f66eb..2ba5ea61 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -16,21 +16,21 @@ echo "Workspace: " ${WORKSPACE}
 echo "Gerrit branch: " $BRANCH
 echo "Version number: " $VERSION
 
+PATH_TO_PARENT=${WORKSPACE}
 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"
-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"
+PARENT_GROUP_ID="org.openecomp.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"
+VFW_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vfw"
+VLB_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlb"
 
 REPO_URL="https://nexus.openecomp.org/content/sites/raw"
 USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
@@ -40,13 +40,13 @@ echo "machine nexus.openecomp.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 $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/{}