diff options
| author |   Lusheng Ji <lji@research.att.com> | 2017-09-21 03:22:18 +0000 |
|---|---|---|
| committer | Lusheng Ji <lji@research.att.com> | 2017-09-21 03:22:27 +0000 |
| commit | d4c05d0b349519dee045485705d01aff1540673a (patch) | |
| tree | d5be047772ea713863e431bf8f14dbc776a5fee9 | |
| parent | f3f90e0b41fdcf8e231045599137bc975ae67b2d (diff) | |
Fix raw artifact push path
Issue-Id: DCAEGEN2-60
Change-Id: I0f420b6a4ebbdf0f2a9d6acd56d09f7366358b2d
Signed-off-by: Lusheng Ji <lji@research.att.com>
| -rwxr-xr-x | mvn-phase-lib.sh | 12 | ||||
| -rw-r--r-- | onap-dcae-dcaepolicy-lib/setup.py | 2 | ||||
| -rw-r--r-- | python-discovery-client/setup.py | 2 | ||||
| -rw-r--r-- | python-dockering/setup.py | 2 |
4 files changed, 9 insertions, 9 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}" diff --git a/onap-dcae-dcaepolicy-lib/setup.py b/onap-dcae-dcaepolicy-lib/setup.py index f6653c9..791b856 100644 --- a/onap-dcae-dcaepolicy-lib/setup.py +++ b/onap-dcae-dcaepolicy-lib/setup.py @@ -27,7 +27,7 @@ setup( version="1.0.0", author='Alex Shatov', license='Apache 2', - email="dcae@lists.openecomp.org", + email="alexs@research.att.com", packages=['onap_dcae_dcaepolicy_lib'], install_requires=[ ], diff --git a/python-discovery-client/setup.py b/python-discovery-client/setup.py index 8c6e3cb..8648808 100644 --- a/python-discovery-client/setup.py +++ b/python-discovery-client/setup.py @@ -26,7 +26,7 @@ setup( version = "2.1.0", packages = find_packages(), author = "Michael Hwang", - email="dcae@lists.openecomp.org", + email="mhwang@research.att.com", description = ("Library of discovery functionality"), license='Apache 2', install_requires = [ diff --git a/python-dockering/setup.py b/python-dockering/setup.py index 3639c95..ab87e62 100644 --- a/python-dockering/setup.py +++ b/python-dockering/setup.py @@ -26,7 +26,7 @@ setup( version="1.3.0", license='Apache 2', author="Michael Hwang", - email="dcae@lists.openecomp.org", + email="mhwang@research.att.com", packages=['dockering'], zip_safe=False, install_requires=[ |