From: Lusheng Ji <lji@research.att.com>
Date: Fri, 13 Oct 2017 15:59:06 +0000 (+0000)
Subject: Fix blueprint push location
X-Git-Tag: 1.0.0-Amsterdam~34
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b004cbc5f697c6c6f5011eab66115c584a732766;p=dcaegen2%2Fplatform%2Fblueprints.git

Fix blueprint push location

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

diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh
index ce38042..6cef83e 100755
--- a/mvn-phase-lib.sh
+++ b/mvn-phase-lib.sh
@@ -364,7 +364,7 @@ upload_files_of_extension()
 {
   FILES=$(ls -1 ./*."$1")
   for F in $FILES ; do
-    upload_raw_file "$F"
+    upload_raw_file "$F" "$2"
   done
 }
 
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 184ac99..3da3e01 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -115,7 +115,11 @@ install)
   ;;
 deploy)
   echo "==> deploy phase script"
-  upload_files_of_extension yaml
+  if [ -z "$MVN_PROJECT_MODULEID" ]; then
+    upload_files_of_extension yaml
+  else
+    upload_files_of_extension yaml "$MVN_PROJECT_MODULEID"
+  fi
   ;;
 *)
   echo "==> unprocessed phase"