From: Lusheng Ji <lji@research.att.com>
Date: Tue, 10 Oct 2017 05:59:07 +0000 (+0000)
Subject: Fix push path
X-Git-Tag: 1.0.0-Amsterdam~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a55c9aa2a7441f39abca4e826924e5975b7e1786;p=dcaegen2%2Fplatform%2Fplugins.git

Fix push path

Issue-Id: DCAEGEN2-128
Change-Id: I51d0cbd6a3d844ac773167e5eacf0e2966bf437e
Signed-off-by: Lusheng Ji <lji@research.att.com>
---

diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh
index 95c8816..3a41708 100755
--- a/mvn-phase-lib.sh
+++ b/mvn-phase-lib.sh
@@ -251,11 +251,18 @@ upload_raw_file()
     OUTPUT_FILE_TYPE='application/octet-stream'
   fi
 
-
+  # for multi module projects, the raw repo path must match with project name, not project + module
+  # FQDN is project + module
+  # GROUPID is project name
+  if [ "$MVN_PROJECT_ARTIFACTID" == "$MVN_PROJECT_MODULEID" ]; then
+    PROJECT_NAME=${MVN_PROJECT_GROUPID}
+  else
+    PROJECT_NAME=${FQDN}
+  fi
   if [ "$MVN_DEPLOYMENT_TYPE" == 'SNAPSHOT' ]; then
-    SEND_TO="${REPO}/${FQDN}/snapshots"
+    SEND_TO="${REPO}/${PROJECT_NAME}/snapshots"
   elif [ "$MVN_DEPLOYMENT_TYPE" == 'STAGING' ]; then
-    SEND_TO="${REPO}/${FQDN}/releases"
+    SEND_TO="${REPO}/${PROJECT_NAME}/releases"
   else
     echo "Unreconfnized deployment type, quit"
     exit