From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 2 Aug 2017 13:49:54 +0000 (+0000)
Subject: Merge "Rename settings-file to mvn-settings"
X-Git-Tag: v0.6.0~3
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=2534bee091ace950a94db3eab1215c6ed3f77c4c;hp=446298ec05b759923d2930246bea7d0afca9c2e0;p=releng%2Fglobal-jjb.git

Merge "Rename settings-file to mvn-settings"
---

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 310e0fe1..7d3e1219 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -137,6 +137,7 @@
               UPLOAD_FILES_PATH={files-dir}
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
+          - ../shell/common-variables.sh
           - ../shell/deploy-maven-file.sh
       - lf-provide-maven-settings-cleanup
 
diff --git a/shell/deploy-maven-file.sh b/shell/deploy-maven-file.sh
index 0ae0f040..37cfd9f4 100644
--- a/shell/deploy-maven-file.sh
+++ b/shell/deploy-maven-file.sh
@@ -17,8 +17,14 @@
 # $GROUP_ID           :  Provided by a job parameter.
 # $UPLOAD_FILES_PATH  :  Provided by a job parameter.
 echo "---> deploy-maven-file.sh"
+
+# DO NOT enable -u because $MAVEN_PARAMS and $MAVEN_OPTIONS could be unbound.
 # Ensure we fail the job if any steps fail.
-set -eu -o pipefail
+set -e -o pipefail
+set +u
+
+export MAVEN_OPTIONS
+export MAVEN_PARAMS
 
 DEPLOY_LOG="$WORKSPACE/archives/deploy-maven-file.log"
 mkdir -p "$WORKSPACE/archives"
@@ -31,5 +37,7 @@ do
                               "$REPO_ID" \
                               "$file" \
                               -b "$MVN" \
-                              -g "$GROUP_ID" | tee "$DEPLOY_LOG"
+                              -g "$GROUP_ID" \
+                              -p "$MAVEN_PARAMS $MAVEN_OPTIONS" \
+                              |& tee "$DEPLOY_LOG"
 done < <(find "$UPLOAD_FILES_PATH" -type f -name "*")