Apply MAVEN_PARAMS in multipatch-build

multipatch-distribution.sh should apply the MAVEN_PARAMS settings
which can be provided via the Jenkins build options. This patch
includes MAVEN_PARAMS in MAVEN_OPTIONS; it also cleans up the variable
declaration.

Change-Id: I41ca01e593a789cb7855bf050a96be5d1a141ac0
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh
index 82220dff32a0f00ae3a6737828296febf4a7a15a..2db7b71d17149bc177c31bd7d08b5a4acf76604b 100755 (executable)
--- a/jjb/integration/multipatch-distribution.sh
+++ b/jjb/integration/multipatch-distribution.sh
@@ -5,12 +5,13 @@ set -e
 # create a fresh empty place to build this custom distribution
 BUILD_DIR=${WORKSPACE}/patch_tester
 DISTRIBUTION_BRANCH_TO_BUILD=$DISTROBRANCH  #renaming variable for clarity
-MAVEN_OPTIONS="$(echo --show-version \
+MAVEN_OPTIONS="${MAVEN_PARAMS} \
+    --show-version \
     --batch-mode \
     -Djenkins \
     -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
     -Dmaven.repo.local=/tmp/r \
-    -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
+    -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r"
 
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR