From: Timoney, Daniel (dt5972) <dtimoney@att.com>
Date: Thu, 23 Feb 2017 14:03:41 +0000 (-0500)
Subject: [DOCKER] Ignore jenkins-settings.xml
X-Git-Tag: v1.2.1~190
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F1335%2F1;p=sdnc%2Foam.git

[DOCKER] Ignore jenkins-settings.xml

Use  and  instead

Change-Id: Ia3abe0005da93490d128254edb199979ab4209bc
Signed-off-by: Timoney, Daniel (dt5972) <dtimoney@att.com>

Former-commit-id: 8e56f4a293cc115f5a2a15b3f35ef2de997abfbe
---

diff --git a/installation/sdnc/src/main/scripts/installZips.sh b/installation/sdnc/src/main/scripts/installZips.sh
index 340b56c1..c1493969 100755
--- a/installation/sdnc/src/main/scripts/installZips.sh
+++ b/installation/sdnc/src/main/scripts/installZips.sh
@@ -68,7 +68,7 @@ fi
 
 cwd=$(pwd)
 
-#mavenOpts=${2:-"-s $cwd/../../jenkins-settings.xml"}
+mavenOpts=${2:-"-s ${SETTINGS_FILE} -gs ${GLOBAL_SETTINGS_FILE}"}
 cd /tmp
 
 echo "Installing SDN-C core version ${SDNC_CORE_VERSION}"