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

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 3cfe1945..0c703486 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,20 +1,27 @@
 #!/bin/bash
 
-########## Define parameters ##########
-VERSION="1.0.0"
-
-PATH_TO_BOOT="../boot"
-PATH_TO_HEAT="../heat"
-PATH_TO_VFW="../vnfs/vFW/scripts"
-PATH_TO_VLB="../vnfs/vLB/scripts"
+set -x
 
-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"
-
-#NEXUSPROXY=https://nexus.openecomp.org
-REPO_URL="${NEXUSPROXY}/content/sites/raw"
+########## Define parameters ##########
+VERSION="1.0.0-SNAPSHOT"
+
+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"
 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)
@@ -23,14 +30,28 @@ echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}"
 
 ##### Upload scripts into Nexus raw repository #####
 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
-ls | xargs -I{} curl -k --netrc-file '${NETRC}' --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{}
+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/{}
+
+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/{}
 ####################################################
+
+########## Clean up ##########
+rm ${NETRC}
+##############################