diff options
| author |   Marco Platania <platania@research.att.com> | 2017-03-24 15:59:19 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-03-24 15:59:19 -0400 |
| commit | 1dbe19bb4b9f951bf11a87940115aac4657a191f (patch) | |
| tree | ec24e99d0038f18621cd995b7ed2f71d401c506e | |
| parent | 87ab6586578f298552bcdddd0b46ad6f255a26a5 (diff) | |
update script/deploy.sh
Change-Id: I7d75026f14c9de84078cde9430fda5b57a9a74c8
Signed-off-by: Marco Platania <platania@research.att.com>
| -rwxr-xr-x | scripts/deploy.sh | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/scripts/deploy.sh b/scripts/deploy.sh index ae92e0bb..088f66eb 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -4,7 +4,7 @@ set -x ########## Define parameters ########## source ${WORKSPACE}"/version.properties" -BRANCH=$(echo ${X} | cut -d'-' -f2) +BRANCH=$(echo ${WORKSPACE} | cut -d'-' -f2) if [[ $BRANCH == "master" ]] then VERSION=$snapshot_version @@ -12,9 +12,9 @@ else VERSION=$release_version fi -echo "This is the workspace: " ${WORKSPACE} -echo "This is the branch: " $BRANCH -echo "This is the version number: " $VERSION +echo "Workspace: " ${WORKSPACE} +echo "Gerrit branch: " $BRANCH +echo "Version number: " $VERSION PATH_TO_BOOT=${WORKSPACE}"/boot" PATH_TO_HEAT=${WORKSPACE}"/heat" @@ -24,16 +24,6 @@ PATH_TO_HEAT_VLB=${WORKSPACE}"/heat/vLB" PATH_TO_VFW=${WORKSPACE}"/vnfs/vFW/scripts" PATH_TO_VLB=${WORKSPACE}"/vnfs/vLB/scripts" -#VERSION="1.1.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" @@ -54,8 +44,8 @@ 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 README.md $REPO_URL/$HEAT_GROUP_ID/ -curl -vk --netrc-file "${NETRC}" --upload-file LICENSE.TXT $REPO_URL/$HEAT_GROUP_ID/ +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/{} |