summaryrefslogtreecommitdiffstats
path: root/mvn-phase-lib.sh
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2017-09-21 03:22:18 +0000
committerLusheng Ji <lji@research.att.com>2017-09-21 03:22:27 +0000
commitd4c05d0b349519dee045485705d01aff1540673a (patch)
treed5be047772ea713863e431bf8f14dbc776a5fee9 /mvn-phase-lib.sh
parentf3f90e0b41fdcf8e231045599137bc975ae67b2d (diff)
Fix raw artifact push path
Issue-Id: DCAEGEN2-60 Change-Id: I0f420b6a4ebbdf0f2a9d6acd56d09f7366358b2d Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'mvn-phase-lib.sh')
-rwxr-xr-xmvn-phase-lib.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh
index 47cd624..c2f300b 100755
--- a/mvn-phase-lib.sh
+++ b/mvn-phase-lib.sh
@@ -114,7 +114,7 @@ expand_templates()
export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/releases"
export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/snapshots"
- export ONAPTEMPLATE_PYPIURL_org_onap_dcaegen2="${MVN_NEXUSPROXY}/content/sites/pypi"
+ export ONAPTEMPLATE_PYPIURL_org_onap_dcaegen2="$MVN_PYPISERVER_BASEURL"
export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases="$MVN_DOCKERREGISTRY_DAILY"
export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_snapshots="$MVN_DOCKERREGISTRY_DAILY/snapshots"
@@ -247,16 +247,16 @@ upload_raw_file()
if [ "$MVN_DEPLOYMENT_TYPE" == 'SNAPSHOT' ]; then
- SEND_TO="${REPO}/${FQDN}/snapshots"
+ SEND_TO="${REPO}/${MVN_PROJECT_GROUPID}/snapshots"
elif [ "$MVN_DEPLOYMENT_TYPE" == 'STAGING' ]; then
- SEND_TO="${REPO}/${FQDN}/releases"
+ SEND_TO="${REPO}/{$MVN_PROJECT_GROUPID}/releases"
else
echo "Unreconfnized deployment type, quit"
exit
fi
- #if [ ! -z "$MVN_PROJECT_MODULEID" ]; then
- # SEND_TO="$SEND_TO/$MVN_PROJECT_MODULEID"
- #fi
+ if [ ! -z "$MVN_PROJECT_MODULEID" ]; then
+ SEND_TO="$SEND_TO/$MVN_PROJECT_MODULEID"
+ fi
echo "Sending ${OUTPUT_FILE} to Nexus: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" -X PUT -H "Content-Type: $OUTPUT_FILE_TYPE" "${SEND_TO}/${OUTPUT_FILE}-${MVN_PROJECT_VERSION}-${TIMESTAMP}"