X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fdeploy.sh;h=fa8372484146d208bac7b63fea25f95cf66394c1;hb=b22c5188b5979d4952010393eb2c51ada2905c27;hp=f5e58846742e8366c1221e003813b9eba517ff65;hpb=98d8193409e77457d5490b4368aea436fa2878fa;p=demo.git diff --git a/scripts/deploy.sh b/scripts/deploy.sh index f5e58846..fa837248 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -10,30 +10,30 @@ PATH_TO_HEAT="/w/workspace/demo-master-merge-java/heat" 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" -VFW_GROUP_ID="org.openecomp.demo.vnfs.vfw" -VLB_GROUP_ID="org.openecomp.demo.vnfs.vlb" +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" 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) -echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "$NETRC" +echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}" ####################################### ##### Upload scripts into Nexus raw repository ##### cd $PATH_TO_BOOT -ls | xargs -I{} curl -vkn --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 -vkn --netrc-file '${NETRC}' --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{} +ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{} cd $PATH_TO_VFW -ls | xargs -I{} curl -vkn --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 -vkn --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 ##########